Merge ~sylvain-pineau/checkbox-ng:qtquick-only into checkbox-ng:master

[Sylvain Pineau]

Ubuntu QML Components are deprecated and we have to exclusively rely on QtQuick only for QML jobs.

This MR updates the checkbox side, a follow-up MR will take care of p-p-checkbox.

Tested using an upcoming version of checkbox-oem-qa snap with the following stage packages added to the checkbox provider.

      - qml-module-qtquick-layouts
      - qml-module-qtquick-controls
      - pyotherside

And a new qmlscene part:

  qmlscene:
    plugin: nil
    stage-packages:
      - qmlscene
    organize:
      'usr/lib/*/qt5/bin/*': bin/

[Paul Larson (pwlars)]

Seems ok so +1, but is there any reason to keep it at all?

review: Approve

[Sylvain Pineau (sylvain-pineau)]

We still have a couple of jobs that rely on QML such has touchscreen tests (e.g multitouch) and the beautiful palm rejection test written by Maciej.

diff --git a/MANIFEST.in b/MANIFEST.in
index 5533661..8631f1b 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -39,9 +39,10 @@ include plainbox/impl/providers/stubbox/units/jobs/*.pxu
 include plainbox/impl/providers/stubbox/units/testplans/*.pxu
 
 include plainbox/qml_shell/qml_shell.qml
-
 include plainbox/data/plainbox-qml-modules/Plainbox/qmldir
 include plainbox/data/plainbox-qml-modules/Plainbox/QmlJob.qml
+include plainbox/data/qml-shell/pipe_handler.py
+include plainbox/data/qml-shell/plainbox_qml_shell.qml
 
 recursive-exclude daily-package-testing *
 recursive-include contrib *.policy
diff --git a/plainbox/data/plainbox-qml-modules/Plainbox/QmlJob.qml b/plainbox/data/plainbox-qml-modules/Plainbox/QmlJob.qml
index 7e2d50a..33a226b 100644
--- a/plainbox/data/plainbox-qml-modules/Plainbox/QmlJob.qml
+++ b/plainbox/data/plainbox-qml-modules/Plainbox/QmlJob.qml
@@ -18,8 +18,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import QtQuick 2.0
-import Ubuntu.Components 1.3
+import QtQuick 2.5
 
 Item {
     signal testDone(var testResult)
diff --git a/plainbox/data/plainbox-qml-modules/Plainbox/qmldir b/plainbox/data/plainbox-qml-modules/Plainbox/qmldir
index 04b009f..76573d0 100644
--- a/plainbox/data/plainbox-qml-modules/Plainbox/qmldir
+++ b/plainbox/data/plainbox-qml-modules/Plainbox/qmldir
@@ -1,7 +1,7 @@
 #
 # This file is part of Checkbox
 #
-# Copyright 2015 Canonical Ltd.
+# Copyright 2018 Canonical Ltd.
 #
 # Authors:
 # - Maciej Kisielewski <[e-mail]>
@@ -20,4 +20,4 @@
 #
 module Plainbox
 
-QmlJob 0.1 QmlJob.qml
+QmlJob 1.0 QmlJob.qml
diff --git a/plainbox/data/qml-shell/plainbox_qml_shell.qml b/plainbox/data/qml-shell/plainbox_qml_shell.qml
index eeaa88b..84c3681 100644
--- a/plainbox/data/qml-shell/plainbox_qml_shell.qml
+++ b/plainbox/data/qml-shell/plainbox_qml_shell.qml
@@ -31,27 +31,27 @@
     'suggestedOutcome': if outcome is 'undecided', than this suggestion will be
     presented to the user, letting them decide the final outcome of a test.
 */
-import QtQuick 2.0
-import Ubuntu.Components 1.2
+import QtQuick 2.5
+import QtQuick.Window 2.2
 import io.thp.pyotherside 1.2
 
-MainView {
+Window {
     id: mainView
-    width: units.gu(100)
-    height: units.gu(75)
+    width: 800
+    height: 600
 
     Python {
         id: py
         Component.onCompleted: {
             addImportPath(Qt.resolvedUrl('.'));
             py.importModule('pipe_handler', function() {
-                py.readAndClose(args.values['fd-in'], function(testingShellData) {
+                py.readAndClose(Qt.application.arguments[8], function(testingShellData) {
                     var new_data = JSON.parse(testingShellData);
                     for (var attrname in new_data) { testingShell[attrname] = new_data[attrname]; }
                     testingShell.getTest = function() {
                         return testingShell['job_repr'];
                     }
-                    loader.setSource(args.values.job,
+                    loader.setSource(Qt.application.arguments[4],
                                      {'testingShell': testingShell});
                 });
             });
@@ -71,32 +71,9 @@ MainView {
     // information and functionality passed to qml job component
     property var testingShell: {
         "name": "Plainbox qml shell",
-        "pageStack": pageStack,
         "python": py
     }
 
-    Arguments {
-        id: args
-        Argument {
-            name: "job"
-            help: "QML-native job to run"
-            required: true
-            valueNames: ["PATH"]
-        }
-        Argument {
-            name: "fd-out"
-            help: "Descriptor number of pipe to write to"
-            required: false
-            valueNames: ["N"]
-        }
-        Argument {
-            name: "fd-in"
-            help: "Descriptor number of pipe to read from"
-            required: false
-            valueNames: ["N"]
-        }
-    }
-
     Loader {
         id: loader
         anchors.fill: parent
@@ -110,10 +87,6 @@ MainView {
 
     function testDone(res) {
         var json_str = JSON.stringify(res) || ""
-        py.writeAndClose(json_str, args.values['fd-out'], Qt.quit);
-    }
-    PageStack {
-        id: pageStack
+        py.writeAndClose(json_str, Qt.application.arguments[6], Qt.quit);
     }
-
 }
diff --git a/plainbox/qml_shell/qml_shell.qml b/plainbox/qml_shell/qml_shell.qml
index 9064cc4..9211bb3 100644
--- a/plainbox/qml_shell/qml_shell.qml
+++ b/plainbox/qml_shell/qml_shell.qml
@@ -31,31 +31,21 @@
     'suggestedOutcome': if outcome is 'undecided', than this suggestion will be
     presented to the user, letting them decide the final outcome of a test.
 */
-import QtQuick 2.0
-import Ubuntu.Components 1.3
+import QtQuick 2.5
+import QtQuick.Window 2.2
 import io.thp.pyotherside 1.4
 
-MainView {
+Window {
     id: mainView
-    width: units.gu(100)
-    height: units.gu(75)
+    width: 800
+    height: 600
 
     // information and functionality passed to qml job component
     property var testingShell: {
         "name": "Standalone testing shell",
-        "pageStack": pageStack,
         "python": py
     }
 
-    Arguments {
-        id: args
-        Argument {
-            name: "job"
-            help: "QML-native job to run"
-            required: true
-            valueNames: ["PATH"]
-        }
-    }
     Python {
         id: py
     }
@@ -72,10 +62,6 @@ MainView {
         }
     }
 
-    PageStack {
-        id: pageStack
-    }
-
     Timer {
         /* because loader is constructed synchronously when the app is started,
          * Qt.quit() would fire a signal that engine hasn't yet connected to.
@@ -91,6 +77,6 @@ MainView {
     }
 
     Component.onCompleted: {
-        loader.setSource(args.values.job, {'testingShell': testingShell});
+        loader.setSource(Qt.application.arguments[4], {'testingShell': testingShell});
     }
 }