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

[Albert Astals Cid]

Make geometry calls for autopilot work again

-geometry is a internal Qt argument that only works for QWidget based apps
Before it was being returned to us in -args but now it's eaten so we
need to use a different one, -windowgeometry

* 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

* 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:775
http://jenkins.qa.ubuntu.com/job/unity8-ci/2563/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4078/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3663
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1433
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/1084
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/1088
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/1088/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/1084
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3560/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4130
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4130/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3665
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3665/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5987
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4993

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

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes - is working good.

 * Did CI run pass? If not, please explain why.
Jenkins got stuck? Triggered a rebuild.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:775
http://jenkins.qa.ubuntu.com/job/unity8-ci/2577/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4110
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3694
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1447/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/1098
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/1102
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/1102/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/1098
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3585
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4171
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4171/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3696
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3696/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6013
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5039

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

review: Needs Fixing (continuous-integration)

=== modified file 'src/ApplicationArguments.h'
--- src/ApplicationArguments.h	2013-12-18 10:23:05 +0000
+++ src/ApplicationArguments.h	2014-03-19 15:32:11 +0000
@@ -29,8 +29,8 @@
     Q_OBJECT
 public:
     ApplicationArguments(const QStringList& args) {
-        if (args.contains(QLatin1String("-geometry")) && args.size() > args.indexOf(QLatin1String("-geometry")) + 1) {
-            QStringList geometryArg = args.at(args.indexOf(QLatin1String("-geometry")) + 1).split('x');
+        if (args.contains(QLatin1String("-windowgeometry")) && args.size() > args.indexOf(QLatin1String("-windowgeometry")) + 1) {
+            QStringList geometryArg = args.at(args.indexOf(QLatin1String("-windowgeometry")) + 1).split('x');
             if (geometryArg.size() == 2) {
                 m_size.rwidth() = geometryArg.at(0).toInt();
                 m_size.rheight() = geometryArg.at(1).toInt();

=== modified file 'src/Panel/Indicators/client/indicatorsclient.cpp'
--- src/Panel/Indicators/client/indicatorsclient.cpp	2014-02-06 09:59:42 +0000
+++ src/Panel/Indicators/client/indicatorsclient.cpp	2014-03-19 15:32:11 +0000
@@ -49,8 +49,8 @@
 
     m_view->setSource(QUrl("IndicatorsClient.qml"));
     m_view->setResizeMode(QQuickView::SizeRootObjectToView);
-    if (args.contains(QLatin1String("-geometry")) && args.size() > args.indexOf(QLatin1String("-geometry")) + 1) {
-        QStringList geometryArg = args.at(args.indexOf(QLatin1String("-geometry")) + 1).split('x');
+    if (args.contains(QLatin1String("-windowgeometry")) && args.size() > args.indexOf(QLatin1String("-windowgeometry")) + 1) {
+        QStringList geometryArg = args.at(args.indexOf(QLatin1String("-windowgeometry")) + 1).split('x');
         if (geometryArg.size() == 2) {
             m_view->resize(geometryArg.at(0).toInt(), geometryArg.at(1).toInt());
         }

=== modified file 'tests/autopilot/unity8/shell/tests/__init__.py'
--- tests/autopilot/unity8/shell/tests/__init__.py	2014-02-22 00:12:49 +0000
+++ tests/autopilot/unity8/shell/tests/__init__.py	2014-03-19 15:32:11 +0000
@@ -181,7 +181,7 @@
                 )
             geo_string = "%dx%d" % (width, height)
             self.unity_geometry_args = [
-                '-geometry',
+                '-windowgeometry',
                 geo_string,
                 '-frameless',
                 '-mousetouch'