Merge lp:~timo-jyrinki/ubuntu-ui-toolkit/add_qmlrunner into lp:ubuntu-ui-toolkit

[Timo Jyrinki]

Offer symlinks for qmlscene via 'qmlrunner' package. See package description for usage instructions. (LP: #1155634)

Offer symlinks for qmlscene via 'qmlrunner' package. See package description for usage instructions. (LP: #1155634)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:485
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/38/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-amd64-ci/38
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-armhf-ci/38

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/38/rebuild

review: Approve (continuous-integration)

[Florian Boucault (fboucault)]

from the comment in the bug I thought you would only add a cheap hack: a symlink to qmlscene without writing a custom one. obviously I guess that did not make much sense.

[Florian Boucault (fboucault)]

1) Author in cpp is incorrect

2) Commented out include should be removed

3) all if/else blocks must have {}, even if they are one liners.

4) #include <QtCore/QLatin1String> seems unused

5) #include #include <QtCore/QByteArray> is missing

6) qmlscene uses a QApplication, not a QGuiApplication

7) QObject::connect(window.engine(), SIGNAL(quit()), qApp, SLOT(quit())); uses qApp even though using the local variable app would be more explicit.

8) This absolutely needs to be revisited as it will slow down the rendering considerably everywhere:
        + // WebKit chokes on threads
 + qputenv("QML_NO_THREADED_RENDERER", QByteArray("1"));

9) That's odd, where did we have a similar hack before?
 + // Ensure that QWebProcess will be found
 + qputenv("PATH", qgetenv("PATH") + ":/opt/qt5/bin");

review: Needs Fixing

[Florian Boucault (fboucault)]

10) No need to call setQuitOnLastWindowClosed(true) as the default value is true:
http://qt-project.org/doc/qt-5.0/qtgui/qguiapplication.html#quitOnLastWindowClosed-prop

review: Needs Fixing

[Florian Boucault (fboucault)]

Have you tested apps that use qmlscene on the device?

[Timo Jyrinki (timo-jyrinki)]

Florian: Ok, I thought this was yours, as Zoltan added it without copyright information.

In other news, I'm not sure why the new binary was wanted in the first place. The symlinks qmlscene (conflicting with qtchooser) and qml, depending on the real qmlscene would work as well - just no need to install qt5-default or qtchooser on the device.

[Timo Jyrinki (timo-jyrinki)]

Offering the symlink only solution now.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:486
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/40/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-amd64-ci/40
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-armhf-ci/40/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/40/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:487
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/41/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-amd64-ci/41
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-armhf-ci/41

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/41/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
Unapproved changes made after approval.
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-autolanding/32/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-amd64-autolanding/32
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-armhf-autolanding/32

review: Needs Fixing (continuous-integration)

[Florian Boucault (fboucault)]

As per the bug report, the binary was _not_ wanted other than to make sure qtbase5-dev is _not_ part of the Ubuntu Touch image.
This looks much better now.

[Florian Boucault (fboucault)]

Have you tested apps that use qmlscene on the device?

[Timo Jyrinki (timo-jyrinki)]

I've now removed qtchooser and qt5-default on the device and installed qmlrunner in place. Everything seems to continue working normally after a reboot. I also manually launched "qmlscene /usr/lib/ubuntu-ui-toolkit/examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qml" via ssh, since I wasn't sure which of the apps are using qmlscene.

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2013-05-07 15:55:52 +0000
+++ debian/control	2013-05-08 05:58:27 +0000
@@ -105,3 +105,21 @@
          ubuntu-ui-toolkit-examples (>= ${source:Version}),
 Description: Test package for Ubuntu UI Toolkit
  Autopilot tests for the ubuntu-ui-toolkit package
+
+Package: qmlrunner
+Architecture: any
+Depends: qmlscene
+Conflicts: qtchooser
+Description: Simple QML Scene symlink provider
+ A simple qmlscene symlink provider. Depend on this package instead of 
+ qtchooser/qt5-default/qmlscene in the following way:
+ .
+ Depends: qmlrunner | qtchooser
+ .
+ The conditional dependency allows either having just qmlrunner installed, 
+ or having for example full ubuntu-sdk (and qt5-default/qtchooser).
+ .
+ This package will be eventually replaced by  upstream 'qml' tool, so 
+ it is encouraged to use the '/usr/bin/qml' symlink already which is also 
+ provided by this package.
+

=== added file 'debian/qmlrunner.install'
--- debian/qmlrunner.install	1970-01-01 00:00:00 +0000
+++ debian/qmlrunner.install	2013-05-08 05:58:27 +0000
@@ -0,0 +1,2 @@
+usr/bin/qml
+usr/bin/qmlscene

=== modified file 'debian/rules'
--- debian/rules	2013-05-05 18:10:47 +0000
+++ debian/rules	2013-05-08 05:58:27 +0000
@@ -7,6 +7,15 @@
 %:
 	dh $@ --fail-missing
 
+override_dh_auto_install:
+	dh_auto_install
+	# Temporary hacks until proper upstream binary installed
+	# Provide both legacy qmlscene and future qml links
+	# -> users may update to use the 'qml' name
+	mkdir -p $(CURDIR)/debian/tmp/usr/bin
+	ln -s /usr/lib/*/qt5/bin/qmlscene $(CURDIR)/debian/tmp/usr/bin/qml
+	ln -s /usr/lib/*/qt5/bin/qmlscene $(CURDIR)/debian/tmp/usr/bin/qmlscene
+
 override_dh_install:
 	dh_auto_build -- docs
 	mkdir -p debian/tmp/`qmake -query QT_INSTALL_DOCS`/qch