Merge lp:~zeller-benjamin/ubuntu-sdk-ide/fix-for-qt56 into lp:ubuntu-sdk-ide

[Benjamin Zeller]

Fix build against Qt 5.6 and most recent UITK

Fix build against Qt 5.6 and most recent UITK

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

PASSED: Continuous integration, rev:125
https://jenkins.ubuntu.com/ubuntu-sdk/job/qtcreator-ide-ci-amd64/25/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1891/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/qtcreator-ide-ci-amd64/25/rebuild

review: Approve (continuous-integration)

[Zoltan Balogh (bzoltan)]

OK

review: Approve

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

PASSED: Continuous integration, rev:126
https://jenkins.ubuntu.com/ubuntu-sdk/job/qtcreator-ide-ci-amd64/26/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1892/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/qtcreator-ide-ci-amd64/26/rebuild

review: Approve (continuous-integration)

[lp:~zeller-benjamin/ubuntu-sdk-ide/fix-for-qt56]

126. By Benjamin Zeller on 2016-03-17

Fix build against Qt 5.6 and most recent UITK.

Approved by ubuntu-sdk-build-bot, Zoltan Balogh.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-03-10 13:19:06 +0000
+++ CMakeLists.txt	2016-03-17 10:08:25 +0000
@@ -37,7 +37,7 @@
   INSTALL_DIR "${QT_INSTALL_DIR}"
   DOWNLOAD_COMMAND  sh -c "bzr branch lp:~bzoltan/+junk/qt-everywhere-opensource-src-5.6.0 ${QT_SOURCE_DIR} -Ossl.cert_reqs=none --use-existing-dir"
   UPDATE_COMMAND    sh -c "exit 0"
-  PATCH_COMMAND     sh -c "${CMAKE_COMMAND} -DQT_SOURCE_DIR=\"${QT_SOURCE_DIR}\" -P ${CMAKE_SOURCE_DIR}/patch-qt.cmake"
+  PATCH_COMMAND     sh -c "${CMAKE_COMMAND} -DQT_SOURCE_DIR=\"${QT_SOURCE_DIR}\" -DCMAKE_SOURCE_DIR=\"${CMAKE_SOURCE_DIR}\" -P ${CMAKE_SOURCE_DIR}/patch-qt.cmake"
   CONFIGURE_COMMAND sh -c "${QT_SOURCE_DIR}/configure -prefix ${QT_INSTALL_DIR} `cat ${CMAKE_SOURCE_DIR}/qt5config`"
   BUILD_COMMAND     sh -c "make ${GENERATED_MAKE_FLAGS}"
   INSTALL_COMMAND   sh -c "make install"
@@ -113,13 +113,9 @@
 )
 
 SET (QTCREATOR_PREFIX "${CMAKE_BINARY_DIR}/qtcreator-build")
-ConcatStrings(QTC_DOWNLOAD_SCRIPT
-  "dget https://launchpad.net/ubuntu/+archive/primary/+files/qtcreator_3.5.0+dfsg-1ubuntu3.dsc "
-  "&& rsync -auvr --delete-after qtcreator-3.5.0+dfsg/ ${QTCREATOR_PREFIX}/qtcreator"
-)
 ConcatStrings(QTC_PATCH_SCRIPT
   "cd ${QTCREATOR_PREFIX}/qtcreator "
-  "&& patch -p1 < ${CMAKE_SOURCE_DIR}/patches/qtc.patch "
+  #"&& patch -p1 < ${CMAKE_SOURCE_DIR}/patches/qtc.patch "
   "&& bzr branch lp:qtcreator-plugin-ubuntu ${QTCREATOR_PREFIX}/qtcreator/src/plugins/ubuntu -Ossl.cert_reqs=none "
   "&& sed -i 's/\\(welcome\\)/\\1 \\\\ \\n   ubuntu/g' ${QTCREATOR_PREFIX}/qtcreator/src/plugins/plugins.pro"
 )
@@ -130,7 +126,7 @@
   SOURCE_DIR  "${QTCREATOR_PREFIX}/qtcreator"
   BINARY_DIR  "${QTCREATOR_PREFIX}/build"
   INSTALL_DIR "${CMAKE_BINARY_DIR}/ubuntu-sdk-ide"
-  DOWNLOAD_COMMAND  sh -c "${QTC_DOWNLOAD_SCRIPT}"
+  DOWNLOAD_COMMAND  sh -c "cd ${QTCREATOR_PREFIX} && ${CMAKE_SOURCE_DIR}/get_package_source.py qtcreator"
   PATCH_COMMAND     sh -c "${QTC_PATCH_SCRIPT}"
   CONFIGURE_COMMAND sh -c "${QT_INSTALL_DIR}/bin/qmake -r USE_SYSTEM_BOTAN=1 ${QTCREATOR_PREFIX}/qtcreator"
   BUILD_COMMAND     sh -c "QT_PRIVATE_HEADERS=${QT_INSTALL_DIR} LD_LIBRARY_PATH=${QT_INSTALL_DIR}/lib make ${GENERATED_MAKE_FLAGS}"

=== modified file 'patch-qt.cmake'
--- patch-qt.cmake	2016-03-17 08:15:07 +0000
+++ patch-qt.cmake	2016-03-17 10:08:25 +0000
@@ -1,8 +1,7 @@
 if (NOT EXISTS "${QT_SOURCE_DIR}/qtfeedback")
   EXECUTE_PROCESS(
     WORKING_DIRECTORY "${QT_SOURCE_DIR}"
-    COMMAND sh -c "dget https://launchpad.net/ubuntu/+archive/primary/+files/qtfeedback-opensource-src_5.0~git20130529-0ubuntu12.dsc \\
-                   && mv qtfeedback-opensource-src-* qtfeedback"
+    COMMAND sh -c "${CMAKE_SOURCE_DIR}/get_package_source.py qtfeedback"
     RESULT_VARIABLE command_result
   )
 
@@ -14,8 +13,7 @@
 if (NOT EXISTS "${QT_SOURCE_DIR}/qtpim")
   EXECUTE_PROCESS(
     WORKING_DIRECTORY "${QT_SOURCE_DIR}"
-    COMMAND sh -c "dget https://launchpad.net/ubuntu/+archive/primary/+files/qtpim-opensource-src_5.0~git20140515~29475884-0ubuntu18.dsc \\
-                   && mv qtpim-opensource-src-* qtpim"
+    COMMAND sh -c "${CMAKE_SOURCE_DIR}/get_package_source.py qtpim"
     RESULT_VARIABLE command_result
   )
 
@@ -29,7 +27,7 @@
     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:~zeller-benjamin/ubuntu-ui-toolkit/qt56 ubuntu-sdk -Ossl.cert_reqs=none \\
-                   && echo \"addModule(ubuntu-sdk,qtdeclarative qtfeedback qtpim)\" >>  qt.pro \\
+                   && patch -p0 < ${CMAKE_SOURCE_DIR}/patches/qt-enable-uitk.patch \\
                    && mkdir -p ubuntu-sdk/.git"
     RESULT_VARIABLE command_result
   )

=== added file 'patches/qt-enable-uitk.patch'
--- patches/qt-enable-uitk.patch	1970-01-01 00:00:00 +0000
+++ patches/qt-enable-uitk.patch	2016-03-17 10:08:25 +0000
@@ -0,0 +1,14 @@
+=== modified file '.gitmodules'
+--- .gitmodules 2016-03-10 12:57:26 +0000
++++ .gitmodules 2016-03-16 11:24:22 +0000
+@@ -342,3 +342,9 @@
+        branch = 5.6
+        status = addon
+        project = qmlcompiler.pro
++[submodule "ubuntu-sdk"]
++       depends = qtdeclarative qtfeedback qtpim
++       path = ubuntu-sdk
++       branch = 5.6
++       status = addon
++       project = ubuntu-sdk.pro
+