Ubuntu SDK IDE

Merge lp:~zeller-benjamin/ubuntu-sdk-ide/autocreate_headers into lp:ubuntu-sdk-ide

  1. autocreate_headers
  2. Merge into trunk
Proposed by Benjamin Zeller
Status: Merged
Approved by: Zoltan Balogh
Approved revision: 99
Merged at revision: 99
Proposed branch: lp:~zeller-benjamin/ubuntu-sdk-ide/autocreate_headers
Merge into: lp:ubuntu-sdk-ide
Diff against target: 25 lines (+2/-2)
2 files modified
get_qt_sources.py (+1/-1)
patch-qt.cmake (+1/-1)
To merge this branch: bzr merge lp:~zeller-benjamin/ubuntu-sdk-ide/autocreate_headers
Reviewer Review Type Date Requested Status
Zoltan Balogh Approve
Review via email: mp+278711@code.launchpad.net

Commit message

Make sure include headers are created for UITK

Description of the change

Make sure include headers are created for UITK

To post a comment you must log in.
Revision history for this message
Zoltan Balogh (bzoltan) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'get_qt_sources.py'
2--- get_qt_sources.py 2015-11-11 12:04:43 +0000
3+++ get_qt_sources.py 2015-11-26 14:14:38 +0000
4@@ -31,7 +31,7 @@
5 "qtenginio-opensource-src"
6 ]
7
8-hack_set = set(['qt3d', 'qtpim', 'qtfeedback', 'qtsystems'])
9+hack_set = set(['qt3d', 'qtpim', 'qtfeedback', 'qtsystems', 'ubuntu-sdk'])
10
11
12 def create_webroot_url_from_self_link(self_link):
13
14=== modified file 'patch-qt.cmake'
15--- patch-qt.cmake 2015-10-17 09:50:35 +0000
16+++ patch-qt.cmake 2015-11-26 14:14:38 +0000
17@@ -31,7 +31,7 @@
18 WORKING_DIRECTORY "${QT_SOURCE_DIR}"
19 COMMAND sh -c "bzr branch lp:ubuntu-ui-toolkit/staging ubuntu-sdk -Ossl.cert_reqs=none \\
20 && echo \"addModule(ubuntu-sdk,qtdeclarative qtfeedback qtpim)\" >> qt.pro \\
21- && mkdir -p qtpim/.git"
22+ && mkdir -p ubuntu-sdk/.git"
23 RESULT_VARIABLE command_result
24 )
25 if (NOT ${command_result} EQUAL 0)

Subscribers

People subscribed via source and target branches