qtcreator-plugin-ubuntu

Merge lp:~zeller-benjamin/qtcreator-plugin-ubuntu/qmake-fallback-fix into lp:qtcreator-plugin-ubuntu

  1. qmake-fallback-fix
  2. Merge into trunk
Proposed by Benjamin Zeller
Status: Merged
Approved by: Zoltan Balogh
Approved revision: 315
Merged at revision: 302
Proposed branch: lp:~zeller-benjamin/qtcreator-plugin-ubuntu/qmake-fallback-fix
Merge into: lp:qtcreator-plugin-ubuntu
Diff against target: 12 lines (+1/-1)
1 file modified
share/qtcreator/ubuntu/scripts/qtc_chroot_wrapper.py (+1/-1)
To merge this branch: bzr merge lp:~zeller-benjamin/qtcreator-plugin-ubuntu/qmake-fallback-fix
Reviewer Review Type Date Requested Status
Zoltan Balogh Approve
Review via email: mp+242642@code.launchpad.net

Commit message

Fix fallback in chroot wrapper script

Description of the change

Fix fallback in chroot wrapper script

To post a comment you must log in.
Revision history for this message
Zoltan Balogh (bzoltan) wrote :

OK

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'share/qtcreator/ubuntu/scripts/qtc_chroot_wrapper.py'
2--- share/qtcreator/ubuntu/scripts/qtc_chroot_wrapper.py 2014-11-14 09:00:01 +0000
3+++ share/qtcreator/ubuntu/scripts/qtc_chroot_wrapper.py 2014-11-24 11:19:31 +0000
4@@ -55,7 +55,7 @@
5 args = sys.argv[1:]
6 command = os.path.basename(sys.argv[0])
7
8-if (command.startswith("qt5-qmake-cross")):
9+if (command.startswith("qt5-qmake")):
10 command_path="/var/lib/schroot/chroots/"+chroot_name_prefix+"-"+dirname+"/usr/bin/"+command
11 if (not os.path.isfile(command_path)):
12 legacy_script = scriptpath+"/qtc_chroot_qmake_legacy"

Subscribers

People subscribed via source and target branches