diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2014-11-19 17:02:53 -0800 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2014-12-13 05:10:54 +0100 |
| commit | c62af804a72c8581faa37a5e67cabfff02bcf44d (patch) | |
| tree | cd0d0389869e72bbc45400383748a05d68a389de /tools | |
| parent | ef89efe137b7c32f4700d259e593bb35c7c264e2 (diff) | |
| download | qtbase-c62af804a72c8581faa37a5e67cabfff02bcf44d.tar.gz | |
Remove mkspecs and detection of Visual Studio .NET 2003
This compiler is no longer supported, as the mkspec was moved to
unsupported/ on commit 55c3799bd32d6fd8ec4b5fa26ebe3e5fdbbc91b3, but the
MSVC support in qmake and in configure depend on an exact string
match. So remove the remaining bits.
No changelog because the actual removal happened in an earlier Qt release.
Change-Id: I538345f4184a6af2ea7449052c161afe4eac625c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/configure/environment.cpp | 7 | ||||
| -rw-r--r-- | tools/configure/environment.h | 1 |
2 files changed, 0 insertions, 8 deletions
diff --git a/tools/configure/environment.cpp b/tools/configure/environment.cpp index 1ef8c10775..7609f6811a 100644 --- a/tools/configure/environment.cpp +++ b/tools/configure/environment.cpp @@ -68,8 +68,6 @@ struct CompilerInfo{ {CC_BORLAND, "Borland C++", 0, "bcc32.exe"}, {CC_MINGW, "MinGW (Minimalist GNU for Windows)", 0, "g++.exe"}, {CC_INTEL, "Intel(R) C++ Compiler for 32-bit applications", 0, "icl.exe"}, // xilink.exe, xilink5.exe, xilink6.exe, xilib.exe - {CC_NET2003, "Microsoft (R) 32-bit C/C++ Optimizing Compiler.NET 2003 (7.1)", "Software\\Microsoft\\VisualStudio\\7.1\\Setup\\VC\\ProductDir", "cl.exe"}, // link.exe, lib.exe - {CC_NET2003, "Microsoft (R) 32-bit C/C++ Optimizing Compiler.NET 2003 (7.1)", "Software\\Wow6432Node\\Microsoft\\VisualStudio\\7.1\\Setup\\VC\\ProductDir", "cl.exe"}, // link.exe, lib.exe {CC_NET2005, "Microsoft (R) 32-bit C/C++ Optimizing Compiler.NET 2005 (8.0)", "Software\\Microsoft\\VisualStudio\\SxS\\VC7\\8.0", "cl.exe"}, // link.exe, lib.exe {CC_NET2005, "Microsoft (R) 32-bit C/C++ Optimizing Compiler.NET 2005 (8.0)", "Software\\Wow6432Node\\Microsoft\\VisualStudio\\SxS\\VC7\\8.0", "cl.exe"}, // link.exe, lib.exe {CC_NET2008, "Microsoft (R) 32-bit C/C++ Optimizing Compiler.NET 2008 (9.0)", "Software\\Microsoft\\VisualStudio\\SxS\\VC7\\9.0", "cl.exe"}, // link.exe, lib.exe @@ -120,9 +118,6 @@ QString Environment::detectQMakeSpec() case CC_NET2005: spec = "win32-msvc2005"; break; - case CC_NET2003: - spec = "win32-msvc2003"; - break; case CC_INTEL: spec = "win32-icc"; break; @@ -151,8 +146,6 @@ Compiler Environment::compilerFromQMakeSpec(const QString &qmakeSpec) return CC_NET2008; if (qmakeSpec == QLatin1String("win32-msvc2005")) return CC_NET2005; - if (qmakeSpec == QLatin1String("win32-msvc2003")) - return CC_NET2003; if (qmakeSpec == QLatin1String("win32-icc")) return CC_INTEL; if (qmakeSpec == QLatin1String("win32-g++")) diff --git a/tools/configure/environment.h b/tools/configure/environment.h index 1a4fbb2fcc..12081e3801 100644 --- a/tools/configure/environment.h +++ b/tools/configure/environment.h @@ -41,7 +41,6 @@ enum Compiler { CC_BORLAND = 0x01, CC_MINGW = 0x02, CC_INTEL = 0x03, - CC_NET2003 = 0x71, CC_NET2005 = 0x80, CC_NET2008 = 0x90, CC_NET2010 = 0xA0, |