diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2012-09-26 10:01:04 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2012-09-26 10:01:04 +0200 |
| commit | a55d47544a104bbe8270bd6b5a72a1215018059c (patch) | |
| tree | a922470562cd187d1b986a8db0df776e37cdc248 /src/libs/utils/buildablehelperlibrary.cpp | |
| parent | 996122b7e9c05c5baca56809d8cd2cf1b58a9f39 (diff) | |
| parent | 471f44aae3ca09d445ae4f424b2242b371580a3e (diff) | |
| download | qt-creator-a55d47544a104bbe8270bd6b5a72a1215018059c.tar.gz | |
Merge remote-tracking branch 'origin/2.6'
Conflicts:
qtcreator.qbp
src/plugins/qtsupport/baseqtversion.cpp
src/tools/tools.pro
Change-Id: I43c391328ae747b3dc566f9db2384fedc1a6d0a5
Diffstat (limited to 'src/libs/utils/buildablehelperlibrary.cpp')
| -rw-r--r-- | src/libs/utils/buildablehelperlibrary.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/libs/utils/buildablehelperlibrary.cpp b/src/libs/utils/buildablehelperlibrary.cpp index 1f765cc792..0713e0f3ed 100644 --- a/src/libs/utils/buildablehelperlibrary.cpp +++ b/src/libs/utils/buildablehelperlibrary.cpp @@ -109,7 +109,9 @@ QString BuildableHelperLibrary::qtVersionForQMake(const QString &qmakePath, bool static QRegExp regexp(QLatin1String("(QMake version|QMake version:)[\\s]*([\\d.]*)"), Qt::CaseInsensitive); regexp.indexIn(output); - if (regexp.cap(2).startsWith(QLatin1String("2."))) { + const QString qmakeVersion = regexp.cap(2); + if (qmakeVersion.startsWith(QLatin1String("2.")) + || qmakeVersion.startsWith(QLatin1String("3."))) { static QRegExp regexp2(QLatin1String("Using Qt version[\\s]*([\\d\\.]*)"), Qt::CaseInsensitive); regexp2.indexIn(output); |