diff options
| author | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2014-11-28 16:19:53 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2014-11-28 16:26:52 +0100 |
| commit | e8da87aff5a23cb33883487210c4517164bfc64d (patch) | |
| tree | 4780ae8e177c20b83394c9ce404272ab9420b12e /src/app/qbs-setup-qt | |
| parent | 3b171baa562bec7cefcdc8c18faa574992e2902f (diff) | |
| parent | be93bcdf9f0c50bcc88557e3f2568568f13ae0bd (diff) | |
Merge branch '1.3'
Change-Id: I46fcee5b64869dd768563757e2d84dfa5dfcfecc
Diffstat (limited to 'src/app/qbs-setup-qt')
| -rw-r--r-- | src/app/qbs-setup-qt/setupqt.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/app/qbs-setup-qt/setupqt.cpp b/src/app/qbs-setup-qt/setupqt.cpp index 4c493083c..42926a530 100644 --- a/src/app/qbs-setup-qt/setupqt.cpp +++ b/src/app/qbs-setup-qt/setupqt.cpp @@ -216,7 +216,7 @@ QtEnvironment SetupQt::fetchEnvironment(const QString &qmakePath) if (!QFile::exists(qtEnvironment.mkspecPath)) { // Work around QTBUG-28792. // The value of QMAKESPEC_ORIGINAL is wrong for MinGW packages. Y u h8 me? - const QRegExp rex(QLatin1String("\\binclude\\(([^)]+qmake\\.conf)\\)")); + const QRegExp rex(QLatin1String("\\binclude\\(([^)]+)/qmake\\.conf\\)")); if (rex.indexIn(fileContent) != -1) qtEnvironment.mkspecPath = QDir::cleanPath(baseDirPath + rex.cap(1)); } |