Merge lp:~aacid/unity8/fix_make_try_warning into lp:unity8

[Albert Astals Cid]

Fix warning when doing make try*

 * Are there any related MPs required for this MP to build/function as expected?
No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

 * Did you make sure that your branch does not contain spurious tags?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
N/A

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1848
http://jenkins.qa.ubuntu.com/job/unity8-ci/6003/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/291
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/241
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/242
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/202
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/291
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/291/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21727

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6003/rebuild

review: Needs Fixing (continuous-integration)

[Andrea Cimitan (cimi)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes, thanks removes the warning
 * Did CI run pass? If not, please explain why.
AP
 * Did you make sure that the branch does not contain spurious tags?
Y

review: Approve

=== modified file 'tests/uqmlscene/CMakeLists.txt'
--- tests/uqmlscene/CMakeLists.txt	2015-04-01 11:25:54 +0000
+++ tests/uqmlscene/CMakeLists.txt	2015-07-08 13:04:38 +0000
@@ -8,6 +8,7 @@
 pkg_check_modules(XCB REQUIRED xcb)
 
 include_directories(
+    ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}/src
     ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
     ${CMAKE_SOURCE_DIR}/libs/UbuntuGestures

=== modified file 'tests/uqmlscene/main.cpp'
--- tests/uqmlscene/main.cpp	2015-06-12 16:07:43 +0000
+++ tests/uqmlscene/main.cpp	2015-07-08 13:04:38 +0000
@@ -345,12 +345,26 @@
     }
 }
 
+class DummyTestRootObject : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(bool windowShown READ windowShown NOTIFY windowShownChanged)
+
+public:
+    DummyTestRootObject(QObject *o) :  QObject(o) {}
+
+    bool windowShown() const { return false; }
+
+Q_SIGNALS:
+    void windowShownChanged();
+};
+
 static QObject *s_testRootObject = nullptr;
 static QObject *testRootObject(QQmlEngine *engine, QJSEngine *jsEngine)
 {
     Q_UNUSED(jsEngine);
     if (!s_testRootObject) {
-        s_testRootObject = new QObject(engine);
+        s_testRootObject = new DummyTestRootObject(engine);
     }
     return s_testRootObject;
 }
@@ -560,3 +574,5 @@
 
     return exitCode;
 }
+
+#include "main.moc"