diff options
| author | Kai Koehne <kai.koehne@digia.com> | 2014-05-05 12:03:42 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-09 15:05:54 +0200 |
| commit | 8304869598812ec5204f4f2a103c73dd97640e25 (patch) | |
| tree | f8bd92f811574f2bc6c19f1389072b8fe7064378 /tools | |
| parent | 92fb0247285c9ccf50935ce0aa7983ae4ac5b7c8 (diff) | |
| download | qt4-tools-8304869598812ec5204f4f2a103c73dd97640e25.tar.gz | |
Fix detection of newer MinGW toolchains in configure.exe
This fixes a regression in the new MinGW packages that are now built
with mkspec win32-g++-4.6: Since we failed to detect this as a MinGW
mkspec we missed to check for headers in all relevant paths, which
disabled windowsxp, windosvista styles by default.
This commit does not apply to Qt 5, similar issues there are being
fixed independently.
[ChangeLog][Windows] configure.exe now detects newer MinGW versions
correctly, enabling windowsxp and windowsvista styles by default.
Task-number: QTBUG-38706
Change-Id: Ib4e7af69e8040aaa28940f501cce5572588d4378
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/configure/configureapp.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 8546573c4b..d052dae6a2 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2177,7 +2177,7 @@ bool Configure::findFile(const QString &fileName) { const QString file = fileName.toLower(); const QString pathEnvVar = QString::fromLocal8Bit(getenv("PATH")); - const QString mingwPath = dictionary["QMAKESPEC"].endsWith("-g++") ? + const QString mingwPath = dictionary["QMAKESPEC"].contains("-g++") ? findFileInPaths("g++.exe", pathEnvVar) : QString(); QString paths; @@ -2249,7 +2249,7 @@ QString Configure::defaultTo(const QString &option) // By default we do not want to compile OCI driver when compiling with // MinGW, due to lack of such support from Oracle. It prob. wont work. // (Customer may force the use though) - if (dictionary["QMAKESPEC"].endsWith("-g++") + if (dictionary["QMAKESPEC"].contains("-g++") && option == "SQL_OCI") return "no"; |