More data-dir fixes
commit40897d6e9a4bbe83b768a04f45bc18536fe78d72
authorMichael Terry <michael.terry@canonical.com>
dateFri 22 Apr 2016, 16:19 (11 years ago)
parent0a1da02
tests/plugins/GlobalShortcut/CMakeLists.txt+1−1
@@ -12,7 +12,7 @@ install(TARGETS GlobalShortcutTestExec
1212 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/GlobalShortcut"
1313)
1414install(FILES shortcut.qml
15− DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/GlobalShortcut"
15+ DESTINATION "${SHELL_APP_DIR}/tests/plugins/GlobalShortcut"
1616)
1717add_unity8_uitest(GlobalShortcut GlobalShortcutTestExec
1818 DEPENDS GlobalShortcut-qml
tests/plugins/GlobalShortcut/GlobalShortcutTest.cpp+1−1
@@ -32,7 +32,7 @@ private Q_SLOTS:
3232 void initTestCase()
3333 {
3434 m_view = new QQuickView();
35− m_view->setSource(QUrl::fromLocalFile(testLibDir() + "/" TEST_DIR "/shortcut.qml"));
35+ m_view->setSource(QUrl::fromLocalFile(testDataDir() + "/" TEST_DIR "/shortcut.qml"));
3636 m_shortcut = dynamic_cast<GlobalShortcut*>(m_view->rootObject()->property("shortcut").value<QObject*>());
3737 QVERIFY(m_shortcut);
3838 m_inactiveShortcut = dynamic_cast<GlobalShortcut*>(m_view->rootObject()->property("inactiveShortcut").value<QObject*>());
tests/plugins/IntegratedLightDM/CMakeLists.txt+1−1
@@ -18,7 +18,7 @@ install(TARGETS GreeterDBusTestExec
1818 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/IntegratedLightDM"
1919)
2020install(FILES greeter.qml
21− DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/IntegratedLightDM"
21+ DESTINATION "${SHELL_APP_DIR}/tests/plugins/IntegratedLightDM"
2222)
2323add_unity8_uitest(GreeterDBus dbus-test-runner
2424 ARG_PREFIX "--parameter"
tests/plugins/IntegratedLightDM/dbus.cpp+1−1
@@ -59,7 +59,7 @@ private Q_SLOTS:
5959 void init()
6060 {
6161 view = new QQuickView();
62− view->setSource(QUrl::fromLocalFile(testLibDir() + "/plugins/IntegratedLightDM/greeter.qml"));
62+ view->setSource(QUrl::fromLocalFile(testDataDir() + "/plugins/IntegratedLightDM/greeter.qml"));
6363 greeter = dynamic_cast<Greeter*>(view->rootObject()->property("greeter").value<QObject*>());
6464 QVERIFY(greeter);
6565 QVERIFY(greeter->authenticationUser() == "");
tests/plugins/ScreenGrabber/CMakeLists.txt+1−1
@@ -12,6 +12,6 @@ install(TARGETS ScreenGrabberTestExec
1212 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/ScreenGrabber"
1313)
1414install(FILES grabber.qml
15− DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/ScreenGrabber"
15+ DESTINATION "${SHELL_APP_DIR}/tests/plugins/ScreenGrabber"
1616)
1717add_unity8_uitest(ScreenGrabber ScreenGrabberTestExec DEPENDS ScreenGrabber-qml)
tests/plugins/ScreenGrabber/ScreenGrabberTest.cpp+1−1
@@ -32,7 +32,7 @@ private Q_SLOTS:
3232 void initTestCase()
3333 {
3434 m_view = new QQuickView();
35− m_view->setSource(QUrl::fromLocalFile(testLibDir() + "/" TEST_DIR "/grabber.qml"));
35+ m_view->setSource(QUrl::fromLocalFile(testDataDir() + "/" TEST_DIR "/grabber.qml"));
3636 m_grabber = dynamic_cast<ScreenGrabber*>(m_view->rootObject()->property("grabber").value<QObject*>());
3737 QVERIFY(m_grabber);
3838 m_view->show();