git.iko.soy/unity8
on xenial help sign in
Use IMPORT_PATH argument instead of defines, and UNITY_PLUGINPATH instead of custom path
commit4b228ddc39f60c1091420d5a2c89f80555ef8189 authorMichał Sawicz <michal.sawicz@canonical.com> dateFri 1 May 2015, 12:44 (11 years ago) parent7269676
6 files changed+8−14
compare with xenial
unifiedsplit
debian/tests/qmluitests.sh+6−6 tests/plugins/Ubuntu/Gestures/CMakeLists.txt+1−3 tests/plugins/Ubuntu/Gestures/GestureTest.cpp−1 tests/plugins/Ubuntu/Gestures/tst_TouchGate.cpp−1 tests/qmltests/Components/CMakeLists.txt+1−2 tests/qmltests/Components/tst_DragHandle.cpp−1
debian/tests/qmluitests.sh+6−6
@@ -7,9 +7,9 @@ dh_auto_configure -- -DCMAKE_INSTALL_LOCALSTATEDIR="/var" \
77 -DUNITY_PLUGINPATH=${SHELL_QML_PATH} \
88 -DUNITY_MOCKPATH=${SHELL_QML_PATH}/mocks \
99 -DQUIET_LOGGER=ON
10−dh_auto_build -- -C tests/mocks 2>&1
11−dh_auto_build -- -C tests/plugins 2>&1
12−dh_auto_build -- -C tests/qmltests 2>&1
13−dh_auto_build -- -C tests/uqmlscene 2>&1
14−dh_auto_build -- -C tests/utils 2>&1
15−dh_auto_build -- xvfbuitests
10+dh_auto_build --parallel -- -C tests/mocks 2>&1
11+dh_auto_build --parallel -- -C tests/plugins 2>&1
12+dh_auto_build --parallel -- -C tests/qmltests 2>&1
13+dh_auto_build --parallel -- -C tests/uqmlscene 2>&1
14+dh_auto_build --parallel -- -C tests/utils 2>&1
15+dh_auto_build -- -k xvfballtests
tests/plugins/Ubuntu/Gestures/CMakeLists.txt+1−3
@@ -14,8 +14,6 @@ include_directories(
1414
1515export_qmlfiles(UbuntuGesturesTest .)
1616
17−add_definitions(-DUBUNTU_GESTURES_PLUGIN_DIR="${CMAKE_BINARY_DIR}/plugins")
18−
1917macro(build_gesture_test CLASSNAME)
2018 add_executable(${CLASSNAME}TestExec tst_${CLASSNAME}.cpp GestureTest.cpp)
2119 qt5_use_modules(${CLASSNAME}TestExec Test Core Qml Gui Quick)
@@ -38,7 +36,7 @@ macro(add_gesture_ui_test CLASSNAME)
3836 DEPENDS UbuntuGesturesTest-qmlfiles
3937 ${ARGN}
4038 )
41− add_manual_qml_test(. ${CLASSNAME} IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins)
39+ add_manual_qml_test(. ${CLASSNAME} IMPORT_PATHS ${UNITY_PLUGINPATH})
4240endmacro()
4341
4442add_gesture_ui_test(DirectionalDragArea)
tests/plugins/Ubuntu/Gestures/GestureTest.cpp−1
@@ -41,7 +41,6 @@ void GestureTest::init()
4141{
4242 m_view = new QQuickView;
4343 m_view->setResizeMode(QQuickView::SizeViewToRootObject);
44− m_view->engine()->addImportPath(QStringLiteral(UBUNTU_GESTURES_PLUGIN_DIR));
4544 m_view->setSource(QUrl::fromLocalFile(m_qmlFilename));
4645 m_view->show();
4746 QVERIFY(QTest::qWaitForWindowExposed(m_view));
tests/plugins/Ubuntu/Gestures/tst_TouchGate.cpp−1
@@ -125,7 +125,6 @@ QQuickView *tst_TouchGate::createView()
125125 QQuickView *window = new QQuickView(0);
126126 window->setResizeMode(QQuickView::SizeRootObjectToView);
127127 window->resize(720, 720);
128− window->engine()->addImportPath(QLatin1String(UBUNTU_GESTURES_PLUGIN_DIR));
129128
130129 return window;
131130}
tests/qmltests/Components/CMakeLists.txt+1−2
@@ -12,7 +12,6 @@ qt5_use_modules(DragHandleTestExec Test Core Qml Gui Quick)
1212target_link_libraries(DragHandleTestExec UbuntuGesturesQml UbuntuGestures)
1313
1414add_unity8_uitest(DragHandle DragHandleTestExec ENVIRONMENT LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/plugins/Ubuntu/Gestures)
15−add_manual_qml_test(. DragHandle IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins)
15+add_manual_qml_test(. DragHandle IMPORT_PATHS ${UNITY_PLUGINPATH})
1616
17−add_definitions(-DUBUNTU_GESTURES_PLUGIN_DIR="${CMAKE_BINARY_DIR}/plugins")
1817add_definitions(-DTEST_DIR="${CMAKE_CURRENT_LIST_DIR}")
tests/qmltests/Components/tst_DragHandle.cpp−1
@@ -127,7 +127,6 @@ QQuickView *tst_DragHandle::createView()
127127{
128128 QQuickView *window = new QQuickView(0);
129129 window->setResizeMode(QQuickView::SizeRootObjectToView);
130− window->engine()->addImportPath(QLatin1String(UBUNTU_GESTURES_PLUGIN_DIR));
131130 window->engine()->addImportPath(QLatin1String(TEST_DIR));
132131
133132 return window;