Merge lp:~zeller-benjamin/ubuntu-ui-toolkit/trusty-builds into lp:ubuntu-ui-toolkit/staging

[Benjamin Zeller]

- Some out of source build fixes
- Implicit casting of QPointer<QObject> to QObject* does not work on trusty

- Some out of source build fixes
- Implicit casting of QPointer<QObject> to QObject* does not work on trusty

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:2090
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1135/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5772/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1135/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2090
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1351/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5773/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1351/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2090
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1101/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5774/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1101/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2090
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1344/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5775/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1344/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:2090
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/712/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1344
        deb: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1344/artifact/artifacts/*zip*/artifacts.zip
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1351
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1135/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1101
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5776/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5775
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5773
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5772
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5774

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/712/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

2090. By Benjamin Zeller on 2016-09-03

Implicit casting of QPointer<QObject> to QObject* does not work on trusty

2089. By Benjamin Zeller on 2016-09-03

Fix out of source builds

=== modified file 'apicheck/apicheck.pro'
--- apicheck/apicheck.pro	2016-01-22 09:31:54 +0000
+++ apicheck/apicheck.pro	2016-09-03 13:07:00 +0000
@@ -4,7 +4,5 @@
 QT += core-private gui-private testlib quick-private
 CONFIG += no_keywords
 SOURCES += apicheck.cpp
-installPath = $$[QT_INSTALL_LIBS]/ubuntu-ui-toolkit
-apicheck.path = $$installPath
-apicheck.files = apicheck
-INSTALLS += $$TARGET
+target.path = $$[QT_INSTALL_LIBS]/ubuntu-ui-toolkit 
+INSTALLS += target

=== modified file 'src/Ubuntu/UbuntuToolkit/menubar.cpp'
--- src/Ubuntu/UbuntuToolkit/menubar.cpp	2016-08-25 14:06:06 +0000
+++ src/Ubuntu/UbuntuToolkit/menubar.cpp	2016-09-03 13:07:00 +0000
@@ -252,11 +252,11 @@
     , m_target(target)
     , m_inserted(false)
 {
-    connect(m_target, &Menu::visibleChanged, this, &PlatformMenuWrapper::updateVisible);
-    connect(m_target, &Menu::textChanged, this, &PlatformMenuWrapper::updateText);
-    connect(m_target, &Menu::enabledChanged, this, &PlatformMenuWrapper::updateEnabled);
-    connect(m_target, &Menu::iconSourceChanged, this, &PlatformMenuWrapper::updateIcon);
-    connect(m_target, &Menu::iconNameChanged, this, &PlatformMenuWrapper::updateIcon);
+    connect(m_target.data(), &Menu::visibleChanged, this, &PlatformMenuWrapper::updateVisible);
+    connect(m_target.data(), &Menu::textChanged, this, &PlatformMenuWrapper::updateText);
+    connect(m_target.data(), &Menu::enabledChanged, this, &PlatformMenuWrapper::updateEnabled);
+    connect(m_target.data(), &Menu::iconSourceChanged, this, &PlatformMenuWrapper::updateIcon);
+    connect(m_target.data(), &Menu::iconNameChanged, this, &PlatformMenuWrapper::updateIcon);
 
     syncPlatformMenu();
 }

=== modified file 'ubuntu-ui-toolkit-launcher/ubuntu-ui-toolkit-launcher.pro'
--- ubuntu-ui-toolkit-launcher/ubuntu-ui-toolkit-launcher.pro	2016-07-22 10:47:24 +0000
+++ ubuntu-ui-toolkit-launcher/ubuntu-ui-toolkit-launcher.pro	2016-09-03 13:07:00 +0000
@@ -12,6 +12,5 @@
 CONFIG += no_keywords c++11
 SOURCES += launcher.cpp
 installPath = $$[QT_INSTALL_PREFIX]/bin
-launcher.path = $$installPath
-launcher.files = ubuntu-ui-toolkit-launcher
-INSTALLS += launcher
+target.path = $$installPath
+INSTALLS += target