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

[Benjamin Zeller]

Stop piling up Qt versions

Stop piling up Qt versions

=== modified file 'patches/qtc.patch'
--- patches/qtc.patch	2015-10-22 10:36:47 +0000
+++ patches/qtc.patch	2015-11-02 12:36:53 +0000
@@ -9,3 +9,23 @@
              currentAutoVersions.insert(i.value()->qmakeCommand().toString(), i.key());
          }
      }
+
+--- qtcreator/src/libs/utils/buildablehelperlibrary.cpp	2015-08-18 12:02:51.000000000 +0200
++++ qtcreator/src/libs/utils/buildablehelperlibrary.cpp	2015-11-02 12:36:14.974481823 +0100
+@@ -88,8 +88,15 @@
+ 
+         if (dir.exists(qmake)) {
+             const QString qmakePath = dir.absoluteFilePath(qmake);
+-            if (isQmake(qmakePath))
++            if (isQmake(qmakePath)) {
++                QFileInfo fi(qmakePath);
++                if (BuildableHelperLibrary::isQtChooser(fi)) {
++                    const QString qtChooserPath = BuildableHelperLibrary::qtChooserToQmakePath(fi.symLinkTarget());
++                    if (!qtChooserPath.isEmpty())
++                        return FileName::fromString(qtChooserPath);
++                }
+                 return FileName::fromString(qmakePath);
++            }
+         }
+
+         // Prefer qmake-qt5 to qmake-qt4 by sorting the filenames in reverse order.