ubports-cn/ubuntu-sdk-ide_orig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge trunk

Browse Source
This commit is contained in:
Benjamin Zeller
2016-03-17 11:08:13 +01:00
parent 96a3741c3a 0547fb01ce
commit 3a0e7029ec
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
patch-qt.cmake
View File

@@ -25,7 +25,8 @@ endif()
if (NOT EXISTS "${QT_SOURCE_DIR}/ubuntu-sdk")
EXECUTE_PROCESS(
WORKING_DIRECTORY "${QT_SOURCE_DIR}"
COMMAND sh -c "bzr branch lp:ubuntu-ui-toolkit/staging ubuntu-sdk -Ossl.cert_reqs=none \\
# COMMAND sh -c "bzr branch lp:ubuntu-ui-toolkit/staging ubuntu-sdk -Ossl.cert_reqs=none \\
COMMAND sh -c "bzr branch lp:~zeller-benjamin/ubuntu-ui-toolkit/qt56 ubuntu-sdk -Ossl.cert_reqs=none \\
&& patch -p0 < ${CMAKE_SOURCE_DIR}/patches/qt-enable-uitk.patch \\
&& mkdir -p ubuntu-sdk/.git"
RESULT_VARIABLE command_result