diff options
| author | Iain <qt-info@nokia.com> | 2009-09-18 12:00:53 (GMT) |
|---|---|---|
| committer | Iain <qt-info@nokia.com> | 2009-09-18 12:08:30 (GMT) |
| commit | 67ea870f6f8432d002110af6f36bbc8539be5131 (patch) | |
| tree | a5217e05b40a7b9bd2f43a163a591cca1bdf2898 /tools | |
| parent | 1640d74f61ccc4921e5d26ddfe7f3613f0221da4 (diff) | |
| download | Qt-67ea870f6f8432d002110af6f36bbc8539be5131.zip Qt-67ea870f6f8432d002110af6f36bbc8539be5131.tar.gz Qt-67ea870f6f8432d002110af6f36bbc8539be5131.tar.bz2 | |
Remove remaining support for win32-mwc mkspec
Qt 4.6 cannot be used with the win32-mwc makespec, as the Metrowerks
compiler supplied with Symbian/S60 releases does not contain enough
support to build the Qt host tools in a Unicode version, and ANSI
support has been removed in 4.6.
Alternative mkspecs are win32-g++, requiring mingw tools to be installed,
or one of the win32-msvc.... mkspecs, requiring MS Visual Studio (Express
edition is fine)
The mwc makefile for qmake was already removed, so this just removes the
remaining support.
Reviewed-by: Jason Barron
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/configure/configureapp.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index c8e369e..94f7915 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -1154,9 +1154,6 @@ void Configure::parseCmdLine() } else { dictionary[ "QMAKEMAKEFILE" ] = "Makefile.win32-g++"; } - } else if ( dictionary[ "QMAKESPEC" ] == QString( "win32-mwc" ) ) { - dictionary[ "QMAKEMAKEFILE" ] = "Makefile.win32-mwc"; - dictionary[ "MAKE" ] = "make"; } else { if ( dictionary[ "MAKE" ].isEmpty() ) dictionary[ "MAKE" ] = "make"; dictionary[ "QMAKEMAKEFILE" ] = "Makefile.win32"; |