git.iko.soy/unity8
on xenial help sign in
Remove android-properties usage that git didn't remove
a588268Rodney Dawes
src/CMakeLists.txt+1−5
compare with xenial
unifiedsplit
@@ -42,15 +42,11 @@ if (ENABLE_TOUCH_EMULATION)
42 set(SOURCE_FILES ${SOURCE_FILES} MouseTouchAdaptor.cpp)
42 set(SOURCE_FILES ${SOURCE_FILES} MouseTouchAdaptor.cpp)
43endif()
43endif()
44
44
45−pkg_check_modules(ANDROID_PROPERTIES REQUIRED libandroid-properties)
46add_executable(${SHELL_APP} ${SOURCE_FILES})
45add_executable(${SHELL_APP} ${SOURCE_FILES})
47
46
48−if (NOT "${ANDROID_PROPERTIES_INCLUDE_DIRS}" STREQUAL "")
49− set_target_properties(${SHELL_APP} PROPERTIES INCLUDE_DIRECTORIES ${ANDROID_PROPERTIES_INCLUDE_DIRS})
50−endif()
51target_link_libraries(${SHELL_APP}
47target_link_libraries(${SHELL_APP}
52 Qt5::DBus Qt5::Gui Qt5::Qml Qt5::Quick Qt5::Test
48 Qt5::DBus Qt5::Gui Qt5::Qml Qt5::Quick Qt5::Test
53− ${ANDROID_PROPERTIES_LDFLAGS} ${GSETTINGS_QT_LDFLAGS}
49+ ${GSETTINGS_QT_LDFLAGS}
54 UbuntuGestures connectivity-qt1 unity8-private
50 UbuntuGestures connectivity-qt1 unity8-private
55 )
51 )
56
52
src/ShellApplication.cpp−3
@@ -25,9 +25,6 @@
25
25
26#include <libintl.h>
26#include <libintl.h>
27
27
28−// libandroid-properties
29−#include <hybris/properties/properties.h>
30−
31// local
28// local
32#include <paths.h>
29#include <paths.h>
33#include "CachingNetworkManagerFactory.h"
30#include "CachingNetworkManagerFactory.h"