diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-02-29 19:38:03 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-01 23:20:44 +0100 |
| commit | d9bf972e2b5f6bace5b7be350a70b4207e320692 (patch) | |
| tree | 242c2a984a7771348a8da12a87fa74bb974be4ba /tools/configure/configureapp.cpp | |
| parent | 1e92e8d385cd689dfd26c60d3c98ae93bb99d466 (diff) | |
merge Makefile.win32-g++{,-sh}
the only difference is in the copy & del commands. the msys tools are
tolerant about windows paths, so this just works.
the in-makefile variant detection is stolen from tools/configure/.
Change-Id: Ia283c1fe2e2aaa8cd5b1dfd7ae29244115f07d65
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Diffstat (limited to 'tools/configure/configureapp.cpp')
| -rw-r--r-- | tools/configure/configureapp.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 36c9501d5a..196fdc9540 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -1136,11 +1136,7 @@ void Configure::parseCmdLine() dictionary[ "QMAKEMAKEFILE" ] = "Makefile.win32"; } else if (dictionary[ "QMAKESPEC" ] == QString("win32-g++")) { if (dictionary[ "MAKE" ].isEmpty()) dictionary[ "MAKE" ] = "mingw32-make"; - if (Environment::detectExecutable("sh.exe")) { - dictionary[ "QMAKEMAKEFILE" ] = "Makefile.win32-g++-sh"; - } else { - dictionary[ "QMAKEMAKEFILE" ] = "Makefile.win32-g++"; - } + dictionary[ "QMAKEMAKEFILE" ] = "Makefile.win32-g++"; } else { if (dictionary[ "MAKE" ].isEmpty()) dictionary[ "MAKE" ] = "make"; dictionary[ "QMAKEMAKEFILE" ] = "Makefile.win32"; |