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

Proposed by Benjamin Zeller on 2016-09-03
Status: Needs review
Proposed branch: lp:~zeller-benjamin/ubuntu-ui-toolkit/trusty-builds
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 47 lines (+9/-12)
3 files modified
apicheck/apicheck.pro (+2/-4)
src/Ubuntu/UbuntuToolkit/menubar.cpp (+5/-5)
ubuntu-ui-toolkit-launcher/ubuntu-ui-toolkit-launcher.pro (+2/-3)
To merge this branch: bzr merge lp:~zeller-benjamin/ubuntu-ui-toolkit/trusty-builds
Reviewer Review Type Date Requested Status
ubuntu-sdk-build-bot continuous-integration Needs Fixing on 2016-09-03
Zoltan Balogh 2016-09-03 Pending
Review via email: mp+304851@code.launchpad.net

This proposal supersedes a proposal from 2016-09-03.

Commit message

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

Description of the change

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

To post a comment you must log in.

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'apicheck/apicheck.pro'
2--- apicheck/apicheck.pro 2016-01-22 09:31:54 +0000
3+++ apicheck/apicheck.pro 2016-09-03 13:07:00 +0000
4@@ -4,7 +4,5 @@
5 QT += core-private gui-private testlib quick-private
6 CONFIG += no_keywords
7 SOURCES += apicheck.cpp
8-installPath = $$[QT_INSTALL_LIBS]/ubuntu-ui-toolkit
9-apicheck.path = $$installPath
10-apicheck.files = apicheck
11-INSTALLS += $$TARGET
12+target.path = $$[QT_INSTALL_LIBS]/ubuntu-ui-toolkit
13+INSTALLS += target
14
15=== modified file 'src/Ubuntu/UbuntuToolkit/menubar.cpp'
16--- src/Ubuntu/UbuntuToolkit/menubar.cpp 2016-08-25 14:06:06 +0000
17+++ src/Ubuntu/UbuntuToolkit/menubar.cpp 2016-09-03 13:07:00 +0000
18@@ -252,11 +252,11 @@
19 , m_target(target)
20 , m_inserted(false)
21 {
22- connect(m_target, &Menu::visibleChanged, this, &PlatformMenuWrapper::updateVisible);
23- connect(m_target, &Menu::textChanged, this, &PlatformMenuWrapper::updateText);
24- connect(m_target, &Menu::enabledChanged, this, &PlatformMenuWrapper::updateEnabled);
25- connect(m_target, &Menu::iconSourceChanged, this, &PlatformMenuWrapper::updateIcon);
26- connect(m_target, &Menu::iconNameChanged, this, &PlatformMenuWrapper::updateIcon);
27+ connect(m_target.data(), &Menu::visibleChanged, this, &PlatformMenuWrapper::updateVisible);
28+ connect(m_target.data(), &Menu::textChanged, this, &PlatformMenuWrapper::updateText);
29+ connect(m_target.data(), &Menu::enabledChanged, this, &PlatformMenuWrapper::updateEnabled);
30+ connect(m_target.data(), &Menu::iconSourceChanged, this, &PlatformMenuWrapper::updateIcon);
31+ connect(m_target.data(), &Menu::iconNameChanged, this, &PlatformMenuWrapper::updateIcon);
32
33 syncPlatformMenu();
34 }
35
36=== modified file 'ubuntu-ui-toolkit-launcher/ubuntu-ui-toolkit-launcher.pro'
37--- ubuntu-ui-toolkit-launcher/ubuntu-ui-toolkit-launcher.pro 2016-07-22 10:47:24 +0000
38+++ ubuntu-ui-toolkit-launcher/ubuntu-ui-toolkit-launcher.pro 2016-09-03 13:07:00 +0000
39@@ -12,6 +12,5 @@
40 CONFIG += no_keywords c++11
41 SOURCES += launcher.cpp
42 installPath = $$[QT_INSTALL_PREFIX]/bin
43-launcher.path = $$installPath
44-launcher.files = ubuntu-ui-toolkit-launcher
45-INSTALLS += launcher
46+target.path = $$installPath
47+INSTALLS += target

Subscribers

People subscribed via source and target branches