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

[Timo Jyrinki]

Change HandlerType from int[2] to QVector<int> to make it work with Qt 5.5 (LP: #1484004) (LP: #1450346)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1656
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2322/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1050
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1052
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1052/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1049

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2322/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1656
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2323/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1051
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1053
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1053/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1050

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2323/rebuild

review: Needs Fixing (continuous-integration)

[lp:~timo-jyrinki/ubuntu-ui-toolkit/qt55_handler_type_qvector]

1657. By Timo Jyrinki on 2015-10-09

Initialize the vector so that it works.

[Timo Jyrinki (timo-jyrinki)]

This now seems to work!

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1657
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2372/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1100/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1102/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1099/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2372/rebuild

review: Needs Fixing (continuous-integration)

[lp:~timo-jyrinki/ubuntu-ui-toolkit/qt55_handler_type_qvector]

1658. By Timo Jyrinki on 2015-10-09

Fix copy-paste typo.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1658
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2373/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1101
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1103
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1103/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1100

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2373/rebuild

review: Approve (continuous-integration)

[Albert Astals Cid (aacid)]

I think personally (non SDK guy) I'd be happier with

    typedef struct {
        int first[2];
        QSocketNotifier *second;
    } HandlerType;

than using a QVector.

[Albert Astals Cid (aacid)]

Or maybe

    typedef QPair<std::array<int, 2>, QSocketNotifier*> HandlerType;
    if (::socketpair(AF_UNIX, SOCK_STREAM, 0, handler.first.data())) {

that saves us from neededing handler.first.resize(2);

[lp:~timo-jyrinki/ubuntu-ui-toolkit/qt55_handler_type_qvector]

1659. By Timo Jyrinki on 2015-10-22

Change to the simpler method suggested.

[Timo Jyrinki (timo-jyrinki)]

Thanks, changed to the latter so it's just two lines change now.

Tested build at https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/landing-012/+sourcepub/5563574/+listing-archive-extra and camera still works after upgrading (one of the users of it).

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1659
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2412/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1140
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1142
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1142/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1139

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2412/rebuild

review: Approve (continuous-integration)

[Zsombor Egri (zsombi)]

Good to go.

review: Approve

=== modified file 'src/Ubuntu/Components/plugin/unixsignalhandler_p.cpp'
--- src/Ubuntu/Components/plugin/unixsignalhandler_p.cpp	2014-03-17 11:57:53 +0000
+++ src/Ubuntu/Components/plugin/unixsignalhandler_p.cpp	2015-10-22 14:30:41 +0000
@@ -48,7 +48,7 @@
         qFatal("UNIX signal registration error");
     }
     HandlerType handler;
-    if (::socketpair(AF_UNIX, SOCK_STREAM, 0, handler.first)) {
+    if (::socketpair(AF_UNIX, SOCK_STREAM, 0, handler.first.data())) {
         qFatal("Cannot create signal socketpair");
     }
     handler.second = new QSocketNotifier(handler.first[1], QSocketNotifier::Read, this);

=== modified file 'src/Ubuntu/Components/plugin/unixsignalhandler_p.h'
--- src/Ubuntu/Components/plugin/unixsignalhandler_p.h	2014-02-06 15:04:43 +0000
+++ src/Ubuntu/Components/plugin/unixsignalhandler_p.h	2015-10-22 14:30:41 +0000
@@ -32,7 +32,7 @@
         Terminate = SIGTERM
     };
 
-    typedef QPair<int[2], QSocketNotifier*> HandlerType;
+    typedef QPair<std::array<int, 2>, QSocketNotifier*> HandlerType;
 
     static UnixSignalHandler &instance()
     {