diff options
| author | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2015-06-17 09:47:24 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2015-06-17 09:11:02 +0000 |
| commit | e9bd0dd08a080dd470593a0abfd9cfa27821752a (patch) | |
| tree | 1e00159c2f2efe317a6c059c516d423af005e531 | |
| parent | fb085b59e9cc493f25f8738b805de5659193821e (diff) | |
| download | qbs-e9bd0dd08a080dd470593a0abfd9cfa27821752a.tar.gz | |
setup-qt: Fix mkspec name extraction for Qt4/mingw.
Change-Id: I21d6a98176a029ea58b9e828ffc909445e4bb0c2
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| -rw-r--r-- | src/app/qbs-setup-qt/setupqt.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/app/qbs-setup-qt/setupqt.cpp b/src/app/qbs-setup-qt/setupqt.cpp index b03f2c9fd..eff87b209 100644 --- a/src/app/qbs-setup-qt/setupqt.cpp +++ b/src/app/qbs-setup-qt/setupqt.cpp @@ -253,6 +253,11 @@ QtEnvironment SetupQt::fetchEnvironment(const QString &qmakePath) qtEnvironment.mkspecPath = QFileInfo(qtEnvironment.mkspecBasePath + QLatin1String("/default")).symLinkTarget(); } + + // E.g. in qmake.conf for Qt 4.8/mingw we find this gem: + // QMAKESPEC_ORIGINAL=C:\\Qt\\Qt\\4.8\\mingw482\\mkspecs\\win32-g++ + qtEnvironment.mkspecPath = QDir::cleanPath(qtEnvironment.mkspecPath); + qtEnvironment.mkspecName = qtEnvironment.mkspecPath; int idx = qtEnvironment.mkspecName.lastIndexOf(QLatin1Char('/')); if (idx != -1) |