git.iko.soy/unity8
on xenial help sign in
Fixed MenuContent test
eaa7339Nick Dedekind
tests/qmltests/modules/Unity/Indicators/CMakeLists.txt+2−8
compare with xenial
unifiedsplit
@@ -6,8 +6,6 @@ find_package(Qt5Quick REQUIRED)
6include_directories(
6include_directories(
7 ${CMAKE_CURRENT_SOURCE_DIR}
7 ${CMAKE_CURRENT_SOURCE_DIR}
8 ${CMAKE_CURRENT_BINARY_DIR}
8 ${CMAKE_CURRENT_BINARY_DIR}
9− ${Qt5Core_INCLUDE_DIRS}
10− ${Qt5Quick_INCLUDE_DIRS}
11)
9)
12
10
13set(IndicatorsFakeQml_SOURCES
11set(IndicatorsFakeQml_SOURCES
@@ -33,18 +31,14 @@ add_library(IndicatorsFakeQml SHARED
33set_target_properties(IndicatorsFakeQml PROPERTIES COMPILE_FLAGS -fvisibility=default)
31set_target_properties(IndicatorsFakeQml PROPERTIES COMPILE_FLAGS -fvisibility=default)
34
32
35target_link_libraries(IndicatorsFakeQml
33target_link_libraries(IndicatorsFakeQml
36− ${Qt5Core_LIBRARIES}
37− ${Qt5Quick_LIBRARIES}
38 ${GOBJECT_LDFLAGS}
34 ${GOBJECT_LDFLAGS}
39 ${QMENUMODEL_LDFLAGS}
35 ${QMENUMODEL_LDFLAGS}
40)
36)
41
37
42−qt5_use_modules(IndicatorsFakeQml Qml)
38+qt5_use_modules(IndicatorsFakeQml Core Qml Quick)
43−
44−
45
39
46file(GLOB IndicatorsFake_QMLFILES
40file(GLOB IndicatorsFake_QMLFILES
47− *.qml
41+ IndicatorsModel.qml
48 qml/FakeMenuPage.qml
42 qml/FakeMenuPage.qml
49)
43)
50
44
tests/qmltests/modules/Unity/Indicators/qml/fake_menu_page1.qml+1−1
@@ -15,7 +15,7 @@
15 */
15 */
16
16
17import QtQuick 2.0
17import QtQuick 2.0
18−import Indicators 0.1 as Indicators
18+import Unity.Indicators 0.1 as Indicators
19
19
20Indicators.FakeMenuPage {
20Indicators.FakeMenuPage {
21 id: menu_plugin1
21 id: menu_plugin1