This commit is contained in:
Zoltán Balogh
2015-08-18 08:10:34 +03:00
parent 1313006940
commit 204e3e059b
2 changed files with 13 additions and 2 deletions

View File

@@ -31,7 +31,7 @@ ExternalProject_Add(qt-everywhere-opensource-src-5.4.2
COMMAND sh -c "dget https://launchpad.net/ubuntu/+archive/primary/+files/qtpim-opensource-src_5.0~git20140515~29475884-0ubuntu11.dsc"
COMMAND sh -c "mv qtpim-opensource-src-* qtpim"
COMMAND sh -c "mkdir qtpim/.git"
# COMMAND sh -c "bzr branch lp:ubuntu-ui-toolkit ubuntu-sdk"
#COMMAND sh -c "bzr branch lp:ubuntu-ui-toolkit ubuntu-sdk"
COMMAND sh -c "bzr branch lp:~zeller-benjamin/ubuntu-ui-toolkit/fixqtbuild ubuntu-sdk"
#COMMAND sh -c "sed -i 's/generate_docs/#generate_docs/g' ubuntu-sdk/documentation/documentation.pro"
#COMMAND sh -c "sed -i 's/autobld_qmltypes/#autobld_qmltypes/g' ubuntu-sdk/features/ubuntu_qml_plugin.prf"
@@ -51,5 +51,17 @@ ExternalProject_Add(qt-everywhere-opensource-src-5.4.2
)
ExternalProject_Add(qtcreator_3.5.0
PREFIX "${CMAKE_SOURCE_DIR}/qt"
DOWNLOAD_COMMAND sh -c "dget https://launchpad.net/ubuntu/+archive/primary/+files/qtcreator_3.5.0~rc1-0ubuntu1.dsc"
PATCH_COMMAND sh -c "bzr branch lp:~zeller-benjamin/qtcreator-plugin-ubuntu/sdk-refactor2 && mv sdk-refactor2 ${CMAKE_SOURCE_DIR}/qt/src/qtcreator-3.5.0~rc1/src/plugins/ubuntu"
CONFIGURE_COMMAND sh -c "echo $PWD && cd ${CMAKE_SOURCE_DIR}/qt/src/qtcreator-3.5.0~rc1 && echo $PWD && ${CMAKE_BINARY_DIR}/qt/bin/qmake"
BUILD_COMMAND sh -c "QT_PRIVATE_HEADERS=${CMAKE_BINARY_DIR} && cd ${CMAKE_SOURCE_DIR}/qt/src/qtcreator-3.5.0~rc1 && make"
INSTALL_COMMAND ""
)
#make module-qtscript
#bzoltan: what should happen is: pull qt, pull uitk into qt, build qt, install qt to builddir/qt, pull qtc, pull ubuntu pluign into qtc, build qtc, install qtc and qt with (make deployqt)
#bzoltan: qtc buildfiles have a "deployqt" target that _should_ do the right thing

View File

@@ -32,7 +32,6 @@
-skip qtwebkit-examples
-skip qtwayland
-skip qtwebengine
-skip qtscript
-skip qtsensors
-skip qtenginio
-skip qtlocation