diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2016-06-15 23:36:48 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2016-06-20 16:13:06 +0000 |
| commit | 145136ab4b0fa3b3845901f41f4d4647b1492b92 (patch) | |
| tree | f27265ffd456d0ef704a4dd3278f0900fc8c31ab /tools/configure | |
| parent | 4da2dda2aa1f710177157dc1cf841e0bf0b9d829 (diff) | |
configure.exe: Remove old code that supported MSVC < 2013
Change-Id: Ib57b52598e2f452985e9fffd14587ce6af57d200
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'tools/configure')
| -rw-r--r-- | tools/configure/configureapp.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index be11851910..fc2000519a 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -1985,11 +1985,6 @@ bool Configure::checkAngleAvailability(QString *errorMessage /* = 0 */) const // it is also present in MinGW. const QString directXSdk = Environment::detectDirectXSdk(); const Compiler compiler = Environment::compilerFromQMakeSpec(dictionary[QStringLiteral("QMAKESPEC")]); - if (compiler < CC_MSVC2012 && directXSdk.isEmpty()) { - if (errorMessage) - *errorMessage = QStringLiteral("There is no Direct X SDK installed or the environment variable \"DXSDK_DIR\" is not set."); - return false; - } const QString compilerHeader = QStringLiteral("d3dcompiler.h"); if (!findFile(compilerHeader)) { if (errorMessage) @@ -2445,10 +2440,6 @@ bool Configure::verifyConfiguration() << "Oracle driver, as the current build will most likely fail." << endl; prompt = true; } - if (dictionary["QMAKESPEC"].endsWith("win32-msvc2008") || dictionary["QMAKESPEC"].endsWith("win32-msvc2010")) { - cout << "ERROR: Qt cannot be compiled with Visual Studio 2008 or 2010." << endl; - prompt = true; - } if (0 != dictionary["ARM_FPU_TYPE"].size()) { QStringList l= QStringList() << "softvfp" |