on xenial help sign in
Fix warning on make try*

file:///usr/lib/x86_64-linux-gnu/qt5/qml/QtTest/TestCase.qml:337:32: Unable to assign [undefined] to bool

commit8f05dd291913730ba885829f408d1de52a4a51e5 authorAlbert Astals Cid <albert.astals@canonical.com> dateWed 8 Jul 2015, 15:00 (11 years ago) parent523f973
2 files changed+18−1
tests/uqmlscene/CMakeLists.txt+1 tests/uqmlscene/main.cpp+17−1
tests/uqmlscene/CMakeLists.txt+1
@@ -8,6 +8,7 @@ qt5_use_modules(uqmlscene Qml Quick Test)
88pkg_check_modules(XCB REQUIRED xcb)
99
1010include_directories(
11+ ${CMAKE_CURRENT_BINARY_DIR}
1112 ${CMAKE_SOURCE_DIR}/src
1213 ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
1314 ${CMAKE_SOURCE_DIR}/libs/UbuntuGestures
tests/uqmlscene/main.cpp+17−1
@@ -345,12 +345,26 @@ static void loadDummyDataFiles(QQmlEngine &engine, const QString& directory)
345345 }
346346}
347347
348+class DummyTestRootObject : public QObject
349+{
350+ Q_OBJECT
351+ Q_PROPERTY(bool windowShown READ windowShown NOTIFY windowShownChanged)
352+
353+public:
354+ DummyTestRootObject(QObject *o) : QObject(o) {}
355+
356+ bool windowShown() const { return false; }
357+
358+Q_SIGNALS:
359+ void windowShownChanged();
360+};
361+
348362static QObject *s_testRootObject = nullptr;
349363static QObject *testRootObject(QQmlEngine *engine, QJSEngine *jsEngine)
350364{
351365 Q_UNUSED(jsEngine);
352366 if (!s_testRootObject) {
353− s_testRootObject = new QObject(engine);
367+ s_testRootObject = new DummyTestRootObject(engine);
354368 }
355369 return s_testRootObject;
356370}
@@ -560,3 +574,5 @@ int main(int argc, char ** argv)
560574
561575 return exitCode;
562576}
577+
578+#include "main.moc"