diff options
| author | Eike Ziller <eike.ziller@nokia.com> | 2012-09-11 14:02:03 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2012-09-11 14:02:03 +0200 |
| commit | 5ac721dd5824f2bb26b9c31148c598a1235c039a (patch) | |
| tree | ad3374c846289cc3095b8c4b8354eb55d58fd387 /src/libs/utils/buildablehelperlibrary.cpp | |
| parent | d09b83c28d2b56b90497e80adc9e98f9c5acec08 (diff) | |
| parent | fa094b226148fa8a6da0036ecc15b7bf6b11cbf6 (diff) | |
| download | qt-creator-5ac721dd5824f2bb26b9c31148c598a1235c039a.tar.gz | |
Merge remote-tracking branch 'origin/2.6'
Conflicts:
qtcreator.pri
qtcreator.qbp
src/libs/utils/utils.pro
Change-Id: I6f0aba746f915d8c51dcf9372f7d9f593562fc2b
Diffstat (limited to 'src/libs/utils/buildablehelperlibrary.cpp')
| -rw-r--r-- | src/libs/utils/buildablehelperlibrary.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libs/utils/buildablehelperlibrary.cpp b/src/libs/utils/buildablehelperlibrary.cpp index 3bde451ca8..1f765cc792 100644 --- a/src/libs/utils/buildablehelperlibrary.cpp +++ b/src/libs/utils/buildablehelperlibrary.cpp @@ -127,7 +127,8 @@ QStringList BuildableHelperLibrary::possibleQMakeCommands() // On unix some distributions renamed qmake to avoid clashes QStringList result; - result << QLatin1String("qmake-qt4") << QLatin1String("qmake4") << QLatin1String("qmake"); + result << QLatin1String("qmake-qt4") << QLatin1String("qmake4") + << QLatin1String("qmake-qt5") << QLatin1String("qmake5") << QLatin1String("qmake"); return result; } |