Use 5.5.1 Qt.

Approved by ubuntu-sdk-build-bot, Benjamin Zeller.
This commit is contained in:
Zoltán Balogh
2016-03-10 10:12:41 +00:00
committed by Tarmac

View File

@@ -24,18 +24,18 @@ cmake_minimum_required(VERSION 2.8.9)
set (ubuntu_sdk_VERSION_MAJOR 3)
set (ubuntu_sdk_VERSION_MINOR 5)
set (QT_VERSION "qt-everywhere-opensource-src-5.4.2")
set (QT_SOURCE_DIR "${CMAKE_BINARY_DIR}/qt-build/qt-everywhere-opensource-src-5.4.2")
set (QT_VERSION "qt-everywhere-opensource-src-5.5.1")
set (QT_SOURCE_DIR "${CMAKE_BINARY_DIR}/qt-build/qt-everywhere-opensource-src-5.5.1")
set (QT_BUILD_DIR "${CMAKE_BINARY_DIR}/qt-build/build")
set (QT_INSTALL_DIR "${CMAKE_BINARY_DIR}/qt")
ExternalProject_Add(${QT_VERSION}
#URL http://download.qt.io/official_releases/qt/5.4/5.4.2/single/qt-everywhere-opensource-src-5.4.2.tar.gz
#URL http://download.qt.io/official_releases/qt/5.4/5.5.1/single/qt-everywhere-opensource-src-5.5.1.tar.gz
PREFIX "qt-build"
SOURCE_DIR "${QT_SOURCE_DIR}"
BINARY_DIR "${QT_BUILD_DIR}"
INSTALL_DIR "${QT_INSTALL_DIR}"
DOWNLOAD_COMMAND sh -c "bzr branch lp:~bzoltan/+junk/qt-everywhere-opensource-src-5.4.2 ${QT_SOURCE_DIR} -Ossl.cert_reqs=none --use-existing-dir"
DOWNLOAD_COMMAND sh -c "bzr branch lp:~bzoltan/+junk/qt-everywhere-opensource-src-5.5.1 ${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"
CONFIGURE_COMMAND sh -c "${QT_SOURCE_DIR}/configure -prefix ${QT_INSTALL_DIR} `cat ${CMAKE_SOURCE_DIR}/qt5config`"