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

use qt-api path for extras

Browse Source
This commit is contained in:
Zoltán Balogh
2015-10-24 15:02:52 +02:00
parent ffb7d002d4
commit b472880b58
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -158,6 +158,6 @@ ExternalProject_Add(${QT_VERSION}-extras
DOWNLOAD_COMMAND sh -c "bzr branch lp:ubuntu-sdk-qmake-extras ${EXTRAS_PREFIX}/ubuntu-sdk-qmake-extras -Ossl.cert_reqs=none --use-existing-dir"
UPDATE_COMMAND sh -c "exit 0" #nothing to update
CONFIGURE_COMMAND sh -c "exit 0"
BUILD_COMMAND sh -c "cp ${EXTRAS_PREFIX}/ubuntu-sdk-qmake-extras/*.prf ${QT_KIT_PREFIX}/qt/usr/ubuntu-sdk-dev/mkspecs/features"
BUILD_COMMAND sh -c "cp ${EXTRAS_PREFIX}/ubuntu-sdk-qmake-extras/*.prf ${QT_KIT_PREFIX}/qt-api/usr/ubuntu-sdk-dev/mkspecs/features"
INSTALL_COMMAND sh -c "cd ${CMAKE_BINARY_DIR} && ${CMAKE_SOURCE_DIR}/create_sdk.sh"
)

2
debian/changelog vendored
View File

@@ -1,4 +1,4 @@
ubuntu-sdk-ide (3.5.0+15.10.20151023-0ubuntu1~0vivid1) vivid; urgency=medium
ubuntu-sdk-ide (3.5.0+15.10.20151023-0ubuntu1~82+201510231904~ubuntu15.04.2) vivid; urgency=medium
* OTA7 update