on xenial help sign in
make the test find the relevant QML plugin
commitc86000a8e4ec781fc886721f0590598b27c4cf85 authorLukáš Tinkl <lukas.tinkl@canonical.com> dateMon 20 Jul 2015, 17:06 (11 years ago) parentec82547
2 files changed+5−2
tests/plugins/ScreenGrabber/CMakeLists.txt+3−2 tests/plugins/ScreenGrabber/ScreenGrabberTest.cpp+2
tests/plugins/ScreenGrabber/CMakeLists.txt+3−2
@@ -6,8 +6,9 @@ include_directories(
66add_definitions(
77 -DCURRENT_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}"
88 )
9+add_definitions(-DBUILT_PLUGINS_DIR="${CMAKE_BINARY_DIR}/plugins")
910
1011add_executable(ScreenGrabberTestExec ScreenGrabberTest.cpp ${CMAKE_SOURCE_DIR}/plugins/ScreenGrabber/screengrabber.cpp)
1112qt5_use_modules(ScreenGrabberTestExec Test Quick)
12−target_link_libraries(ScreenGrabberTestExec ScreenGrabber-qml)
13−add_unity8_uitest(ScreenGrabber ScreenGrabberTestExec ADD_TEST)
13+target_link_libraries(ScreenGrabberTestExec ${Qt5Quick_LIBRARIES} ScreenGrabber-qml)
14+add_unity8_uitest(ScreenGrabber ScreenGrabberTestExec DEPENDS ScreenGrabber-qml)
tests/plugins/ScreenGrabber/ScreenGrabberTest.cpp+2
@@ -19,6 +19,7 @@
1919#include <QtTest>
2020#include <QtQuick/QQuickView>
2121#include <QtQuick/QQuickItem>
22+#include <QQmlEngine>
2223
2324class ScreenGrabberTest: public QObject
2425{
@@ -29,6 +30,7 @@ private Q_SLOTS:
2930 void initTestCase()
3031 {
3132 m_view = new QQuickView();
33+ m_view->engine()->addImportPath(BUILT_PLUGINS_DIR);
3234 m_view->setSource(QUrl::fromLocalFile(CURRENT_SOURCE_DIR "/grabber.qml"));
3335 m_grabber = dynamic_cast<ScreenGrabber*>(m_view->rootObject()->property("grabber").value<QObject*>());
3436 QVERIFY(m_grabber);