Ubuntu SDK IDE

Merge lp:~zeller-benjamin/ubuntu-sdk-ide/fixes4 into lp:~bzoltan/ubuntu-sdk-ide/trunk

  1. fixes4
  2. Merge into trunk
Proposed by Benjamin Zeller
Status: Merged
Merged at revision: 65
Proposed branch: lp:~zeller-benjamin/ubuntu-sdk-ide/fixes4
Merge into: lp:~bzoltan/ubuntu-sdk-ide/trunk
Diff against target: 11 lines (+1/-1)
1 file modified
CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~zeller-benjamin/ubuntu-sdk-ide/fixes4
Reviewer Review Type Date Requested Status
Zoltan Balogh Pending
Review via email: mp+275033@code.launchpad.net

Commit message

copy the extras to the correct directory

Description of the change

copy the extras to the correct directory

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2015-10-19 11:03:00 +0000
3+++ CMakeLists.txt 2015-10-20 13:48:35 +0000
4@@ -136,6 +136,6 @@
5 DOWNLOAD_COMMAND sh -c "bzr branch lp:ubuntu-sdk-qmake-extras ${EXTRAS_PREFIX}/ubuntu-sdk-qmake-extras -Ossl.cert_reqs=none --use-existing-dir"
6 UPDATE_COMMAND sh -c "exit 0" #nothing to update
7 CONFIGURE_COMMAND sh -c "exit 0"
8- BUILD_COMMAND sh -c "cp ${EXTRAS_PREFIX}/ubuntu-sdk-qmake-extras/*.prf ${QT_KIT_PREFIX}/qt/mkspecs/features"
9+ BUILD_COMMAND sh -c "cp ${EXTRAS_PREFIX}/ubuntu-sdk-qmake-extras/*.prf ${QT_KIT_PREFIX}/qt/usr/ubuntu-sdk-dev/mkspecs/features"
10 INSTALL_COMMAND sh -c "exit 0"
11 )

Subscribers

People subscribed via source and target branches

to all changes: