on xenial help sign in
Remove android-properties usage that git didn't remove
commita588268a81b82add66e526e4c37ab771847610d3 authorRodney Dawes <dobey@ubports.com> dateMon 31 Aug 2020, 16:17 (6 years ago) parentc250d36
2 files changed+1−8
src/CMakeLists.txt+1−5 src/ShellApplication.cpp−3
src/CMakeLists.txt+1−5
@@ -42,15 +42,11 @@ if (ENABLE_TOUCH_EMULATION)
4242 set(SOURCE_FILES ${SOURCE_FILES} MouseTouchAdaptor.cpp)
4343endif()
4444
45−pkg_check_modules(ANDROID_PROPERTIES REQUIRED libandroid-properties)
4645add_executable(${SHELL_APP} ${SOURCE_FILES})
4746
48−if (NOT "${ANDROID_PROPERTIES_INCLUDE_DIRS}" STREQUAL "")
49− set_target_properties(${SHELL_APP} PROPERTIES INCLUDE_DIRECTORIES ${ANDROID_PROPERTIES_INCLUDE_DIRS})
50−endif()
5147target_link_libraries(${SHELL_APP}
5248 Qt5::DBus Qt5::Gui Qt5::Qml Qt5::Quick Qt5::Test
53− ${ANDROID_PROPERTIES_LDFLAGS} ${GSETTINGS_QT_LDFLAGS}
49+ ${GSETTINGS_QT_LDFLAGS}
5450 UbuntuGestures connectivity-qt1 unity8-private
5551 )
5652
src/ShellApplication.cpp−3
@@ -25,9 +25,6 @@
2525
2626#include <libintl.h>
2727
28−// libandroid-properties
29−#include <hybris/properties/properties.h>
30−
3128// local
3229#include <paths.h>
3330#include "CachingNetworkManagerFactory.h"