Merge lp:~larryprice/libertine/fix-crash-on-start into lp:libertine

[Larry Price]

Fix crash on start in unity 7 when launching from the dash.

Fix crash on start in unity 7 when launching from the dash.

I found a StackOverflow question with a very similar bug which points out the proper use of the QGuiApplication constructor (https://stackoverflow.com/questions/33271398/c-segmentation-fault-when-inheritance). Since making this change, I have installed the deb on several machines and no longer see the crash on startup.

[lp:~larryprice/libertine/fix-crash-on-start]

306. By Larry Price on 2016-10-03

consistency, my dear

[Libertine CI Bot (libertine-ci-bot)]

PASSED: Continuous integration, rev:306
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/148/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/379
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=default/300
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=default/300
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=default/300
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=vivid+overlay,testname=default/300
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=default/300
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=yakkety,testname=default/300
    None: https://jenkins.canonical.com/libertine/job/lp-generic-update-mp/289/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/381
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=vivid+overlay/363
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=xenial+overlay/363
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=yakkety/363
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/362
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/362/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/362
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/362/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=yakkety/362
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=yakkety/362/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/362
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/362/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/362
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/362/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=yakkety/362
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=yakkety/362/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/148/rebuild

review: Approve (continuous-integration)

[Christopher Townsend (townsend)]

Ok

review: Approve

=== modified file 'libertine/libertine.cpp'
--- libertine/libertine.cpp	2016-07-15 18:39:58 +0000
+++ libertine/libertine.cpp	2016-10-03 15:54:47 +0000
@@ -84,7 +84,7 @@
  * environment variables, and configurations files and displays the GUI.
  */
 Libertine::
-Libertine(int argc, char* argv[])
+Libertine(int& argc, char** argv)
 : QGuiApplication(argc, argv)
 , main_qml_source_file_(find_main_qml_source_file())
 {

=== modified file 'libertine/libertine.h'
--- libertine/libertine.h	2016-07-15 18:39:58 +0000
+++ libertine/libertine.h	2016-10-03 15:54:47 +0000
@@ -38,7 +38,7 @@
   Q_OBJECT
 
 public:
-    Libertine(int argc, char* argv[]);
+    Libertine(int& argc, char** argv);
     ~Libertine();
 
 private: