Ubuntu SDK IDE

Merge lp:~zeller-benjamin/ubuntu-sdk-ide/noqtversionpiling into lp:ubuntu-sdk-ide

  1. noqtversionpiling
  2. Merge into trunk
Proposed by Benjamin Zeller
Status: Merged
Merged at revision: 91
Proposed branch: lp:~zeller-benjamin/ubuntu-sdk-ide/noqtversionpiling
Merge into: lp:ubuntu-sdk-ide
Diff against target: 27 lines (+20/-0)
1 file modified
patches/qtc.patch (+20/-0)
To merge this branch: bzr merge lp:~zeller-benjamin/ubuntu-sdk-ide/noqtversionpiling
Reviewer Review Type Date Requested Status
Zoltan Balogh Pending
Review via email: mp+276384@code.launchpad.net

Commit message

Stop piling up Qt versions

Description of the change

Stop piling up Qt versions

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 'patches/qtc.patch'
2--- patches/qtc.patch 2015-10-22 10:36:47 +0000
3+++ patches/qtc.patch 2015-11-02 12:36:53 +0000
4@@ -9,3 +9,23 @@
5 currentAutoVersions.insert(i.value()->qmakeCommand().toString(), i.key());
6 }
7 }
8+
9+--- qtcreator/src/libs/utils/buildablehelperlibrary.cpp 2015-08-18 12:02:51.000000000 +0200
10++++ qtcreator/src/libs/utils/buildablehelperlibrary.cpp 2015-11-02 12:36:14.974481823 +0100
11+@@ -88,8 +88,15 @@
12+
13+ if (dir.exists(qmake)) {
14+ const QString qmakePath = dir.absoluteFilePath(qmake);
15+- if (isQmake(qmakePath))
16++ if (isQmake(qmakePath)) {
17++ QFileInfo fi(qmakePath);
18++ if (BuildableHelperLibrary::isQtChooser(fi)) {
19++ const QString qtChooserPath = BuildableHelperLibrary::qtChooserToQmakePath(fi.symLinkTarget());
20++ if (!qtChooserPath.isEmpty())
21++ return FileName::fromString(qtChooserPath);
22++ }
23+ return FileName::fromString(qmakePath);
24++ }
25+ }
26+
27+ // Prefer qmake-qt5 to qmake-qt4 by sorting the filenames in reverse order.

Subscribers

People subscribed via source and target branches