Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/windowLauncher into lp:ubuntu-ui-toolkit/staging

[Cris Dywan]

Launcher: create QQuickView if no window provided

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2027
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1033/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4274/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1033/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2027
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/814/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4275/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/814/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2027
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/788/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4276/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/788/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2027
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1009/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4277/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1009/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2027
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/521/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1009
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1033
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/814
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/788
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4278/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4277
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4274
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4275
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4276

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/521/rebuild

review: Approve (continuous-integration)

[Tim Peeters (tpeeters)]

Inline comments below.

review: Needs Fixing

[Tim Peeters (tpeeters)]

Looks good. Happroving.

review: Approve

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:2028
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1027/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4358/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1027/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2028
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1050/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4359/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1050/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2028
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/831/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4360/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/831/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2028
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/832/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4361/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/832/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2028
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1051/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4362/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1051/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2028
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1026/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4363/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1026/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2028
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/805/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4364/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/805/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2028
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/532/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1026
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1050
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/831
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/805
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4365/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4363
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4359
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4360
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4364

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/532/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2028
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/806/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4366/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/806/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-autolanding/381/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1027/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1051
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/832
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/806
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-land-mp/389/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4358
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4362
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4361
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4366

review: Needs Fixing (continuous-integration)

[Tim Peeters (tpeeters)]

Let's try again.

review: Approve

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2028
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1052/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4367/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1052/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2028
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/833/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4368/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/833/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2028
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/807/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4369/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/807/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2028
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1028/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4370/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1028/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:2028
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1053/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4480/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1053/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/test_launcher.py'
--- tests/autopilot/ubuntuuitoolkit/tests/test_launcher.py	2015-04-14 21:02:06 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/test_launcher.py	2016-07-12 12:06:33 +0000
@@ -37,6 +37,18 @@
         self.assertThat(textfield.text, Eventually(Equals("Yes")))
 
 
+class LauncherWindowTestCase(tests.QMLFileAppTestCase):
+    path = os.path.abspath(__file__)
+    dir_path = os.path.dirname(path)
+    test_qml_file_path = os.path.join(
+        dir_path, 'test_launcher.window.qml')
+
+    def test_window_root_item(self):
+        label = self.main_view.select_single(objectName="label")
+        self.assertThat(label.text,
+                        Eventually(Equals("Lorem ipsum dolor sit amet")))
+
+
 class LauncherQtTestTestCase(tests.QMLFileAppTestCase):
     path = os.path.abspath(__file__)
     dir_path = os.path.dirname(path)

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/test_launcher.testcase.qml'
--- tests/autopilot/ubuntuuitoolkit/tests/test_launcher.testcase.qml	2015-03-03 13:20:06 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/test_launcher.testcase.qml	2016-07-12 12:06:33 +0000
@@ -17,7 +17,7 @@
 import QtQuick 2.0
 import QtTest 1.0
 import Ubuntu.Components 1.1
-import Ubuntu.Test 1.0
+import Ubuntu.Test 1.0 // UbuntuTestCase
 
 MainView {
     width: units.gu(48)

=== added file 'tests/autopilot/ubuntuuitoolkit/tests/test_launcher.window.qml'
--- tests/autopilot/ubuntuuitoolkit/tests/test_launcher.window.qml	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/test_launcher.window.qml	2016-07-12 12:06:33 +0000
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2014-2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import QtQuick.Window 2.2 // Not Ubuntu.Test
+import Ubuntu.Components 1.3
+
+Window {
+    title: "Hello World"
+    minimumWidth: units.gu(30)
+    minimumHeight: units.gu(50)
+    maximumWidth: units.gu(90)
+    maximumHeight: units.gu(120)
+    MainView {
+        objectName: "mainView"
+
+        Page {
+            title: "Launcher/Window"
+
+            Column {
+                Label {
+                    objectName: "label"
+                    text: "Lorem ipsum dolor sit amet"
+                    width: units.gu(25)
+                    height: units.gu(25)
+                }
+            }
+        }
+    }
+}

=== modified file 'ubuntu-ui-toolkit-launcher/launcher.cpp'
--- ubuntu-ui-toolkit-launcher/launcher.cpp	2016-07-07 15:33:34 +0000
+++ ubuntu-ui-toolkit-launcher/launcher.cpp	2016-07-12 12:06:33 +0000
@@ -21,10 +21,12 @@
 
 #include <iostream>
 #include <QtCore/qdebug.h>
+#include <QtQuick/QQuickItem>
 #include <QtQuick/QQuickView>
 #include <QtGui/QGuiApplication>
 #include <QtQml/QQmlEngine>
 #include <QtQml/QQmlContext>
+#include <QtQml/QQmlComponent>
 #include <QtCore/QFileInfo>
 #include <QLibrary>
 #include <QOpenGLContext>
@@ -117,43 +119,99 @@
     // Allow manual execution of unit tests using Qt.Test
     qmlRegisterSingletonType<QObject>("Qt.test.qtestroot", 1, 0, "QTestRootObject", testRootObject);
 
-    QQmlEngine* engine;
+    QPointer<QQmlEngine> engine;
+    QScopedPointer<QQuickWindow> window;
+    QString testCaseImport;
+    // Let's see if the source file exists
+    QFile sourceCode(filename);
+    if (!sourceCode.open(QIODevice::ReadOnly)) {
+        qCritical("%s", qPrintable(sourceCode.errorString()));
+        return 1;
+    }
+    while (!sourceCode.atEnd()) {
+        QByteArray line(sourceCode.readLine());
+        if (line.contains("{"))
+            break;
+        // Hack to avoid assertion if QtTest or Ubuntu.Test is used:
+        // ASSERT: "QTest::TestLoggers::loggerCount() != 0" in file qtestlog.cpp, line 278
+        if ((line.startsWith("import ") && QString(line).split("//")[0].split("/*")[0].contains("Test"))) {
+            testCaseImport = line;
+            break;
+        }
+    }
+    QUrl source(QUrl::fromLocalFile(filename));
+
     // The default constructor affects the components tree (autopilot vis)
-    QScopedPointer<QQuickView> view;
-    if (args.isSet(_engine)) {
-        view.reset(new QQuickView());
+    if (args.isSet(_engine) || !testCaseImport.isEmpty()) {
+        QQuickView *view(new QQuickView());
+        if (args.isSet(_import)) {
+            QStringList paths = args.values(_import);
+            Q_FOREACH(const QString &path, paths) {
+                engine->addImportPath(path);
+            }
+        }
+
+        view->setSource(source);
+        while (view->status() == QQuickView::Loading)
+            QCoreApplication::processEvents();
+        if (view->errors().count() > 0) {
+            args.showHelp(3);
+        }
+        // An unsupported root object is not technically an error
+        if (!view->rootObject()) {
+            if (!testCaseImport.isEmpty())
+                qCritical("Note: QtTest or Ubuntu.Test was detected here: %s", qPrintable(testCaseImport));
+            return 1;
+        }
+
+        window.reset(view);
         engine = view->engine();
     } else {
         engine = new QQmlEngine();
-        view.reset(new QQuickView(engine, NULL));
-        engine->setParent(view.data());
-    }
-
-    if (args.isSet(_import)) {
-        QStringList paths = args.values(_import);
-        Q_FOREACH(const QString &path, paths) {
-            engine->addImportPath(path);
-        }
-    }
-
-    view->setResizeMode(QQuickView::SizeRootObjectToView);
-    view->setTitle("UI Toolkit QQuickView");
+        if (args.isSet(_import)) {
+            QStringList paths = args.values(_import);
+            Q_FOREACH(const QString &path, paths) {
+                engine->addImportPath(path);
+            }
+        }
+
+        QObject::connect(engine, SIGNAL(quit()), QCoreApplication::instance(), SLOT(quit()));
+        QPointer<QQmlComponent> component(new QQmlComponent(engine));
+        component->loadUrl(source, QQmlComponent::Asynchronous);
+        while (component->isLoading())
+            QCoreApplication::processEvents();
+        QObject *toplevel(component->create());
+        if (!toplevel && component->isError()) {
+            qCritical("%s", qPrintable(component->errorString()));
+            return 1;
+        }
+
+        window.reset(qobject_cast<QQuickWindow *>(toplevel));
+        if (window)
+            engine->setIncubationController(window->incubationController());
+        else {
+            QQuickItem *rootItem = qobject_cast<QQuickItem *>(toplevel);
+            if (rootItem) {
+                QQuickView *view(new QQuickView(engine, 0));
+                window.reset(view);
+                view->setResizeMode(QQuickView::SizeRootObjectToView);
+                view->setContent(source, component, rootItem);
+            }
+        }
+    }
+
+    if (window->title().isEmpty())
+        window->setTitle("UI Toolkit QQuickView");
     if (args.isSet(_frameless)) {
-        view->setFlags(Qt::FramelessWindowHint);
+        window->setFlags(Qt::FramelessWindowHint);
     }
+    window->show();
 
     if (args.isSet(_enableTouch)) {
         // has no effect if we have touch screen
         new UT_PREPEND_NAMESPACE(MouseTouchAdaptor)(&application);
     }
 
-    QUrl source(QUrl::fromLocalFile(filename));
-    view->setSource(source);
-    if (view->errors().count() > 0) {
-        args.showHelp(3);
-    }
-    view->show();
-
     return application.exec();
 }