diff options
| author | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2014-11-13 18:13:26 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2014-11-14 09:43:29 +0100 |
| commit | 21978bc41e5ac9959cedc93cc9aacff4831ee2ef (patch) | |
| tree | cf7403affef60553ca6bcc1345607f79c82d7071 | |
| parent | 1d24d16379df6cd8a01434a13c3fe301d44eb0d2 (diff) | |
| download | qbs-21978bc41e5ac9959cedc93cc9aacff4831ee2ef.tar.gz | |
Fix profile setup for mingw-qt4.
When extracting the mkspec name, we must not capture the trailing
"/qmake.conf" in our regular expression.
Change-Id: I0bca572ca173e1300ced6d5753d4140a12e33a6e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| -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 64ef3d174..dd404e292 100644 --- a/src/app/qbs-setup-qt/setupqt.cpp +++ b/src/app/qbs-setup-qt/setupqt.cpp @@ -228,7 +228,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)); } |