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

[Albert Astals Cid]

unity-scope-tool: Use parse instead of process

This way we can pass --desktop_file_hint on the phone

 * 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

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2526
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1642/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/2184/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2212
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2119
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2119
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2119
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2110/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2110/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2110/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2110
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2110/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2110
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2110/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2110
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2110/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2110/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2110
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2110/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2110/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1642/rebuild

review: Needs Fixing (continuous-integration)

[Michael Terry (mterry)]

LGTM. CI failures seem unrelated.

Another option would be to add explicit support for --desktop_file_hint. But this works too, and it doesn't super matter for this helper tool.

review: Approve

=== modified file 'tools/scopetool.cpp'
--- tools/scopetool.cpp	2016-05-09 12:38:10 +0000
+++ tools/scopetool.cpp	2016-06-29 15:52:36 +0000
@@ -59,7 +59,7 @@
     "Otherwise passing a path to a scope config file will open a session with\n"
     "only that scope (assuming that the binary implementing the scope can be\n"
     "found in the same directory as the config file).");
-    parser.addHelpOption();
+    QCommandLineOption helpOption = parser.addHelpOption();
     parser.addPositionalArgument("scopes", "Paths to scope config files to spawn, optionally.", "[scopes...]");
 
     QCommandLineOption includeSystemScopes("include-system-scopes",
@@ -70,7 +70,11 @@
     parser.addOption(includeServerScopes);
     parser.addOption(includeSystemScopes);
 
-    parser.process(*application);
+    parser.parse(application->arguments());
+
+    if (parser.isSet(helpOption)) {
+        parser.showHelp();
+    }
 
     QStringList extraScopes = parser.positionalArguments();