From 4091202cf19ef8ed2901d026e365aaa7a3049d77 Mon Sep 17 00:00:00 2001 From: David Faure Date: Tue, 30 Dec 2014 14:33:51 +0100 Subject: configure.exe: improve error message by adding the filename. Before: Could not find output file: No such file or directory After: Could not find output file 'arch.exe' or 'arch' in C:/Qt/qt5/qtbase/config.tests/arch : No such file or directory (it turned out that linking in that directory failed because of a wrong %PATH%) Change-Id: I948d7f10f7e82f77a08ac9a8db76d97536c42dd0 Reviewed-by: Thiago Macieira --- tools/configure/configureapp.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools/configure') diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 2bd94c199e..105a9ef04c 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -3172,7 +3172,7 @@ void Configure::detectArch() if (!exe.open(QFile::ReadOnly)) { // no Text, this is binary exe.setFileName("arch"); if (!exe.open(QFile::ReadOnly)) { - cout << "Could not find output file: " << qPrintable(exe.errorString()) << endl; + cout << "Could not find output file '" << qPrintable(arch_exe) << "' or 'arch' in " << qPrintable(newpwd) << " : " << qPrintable(exe.errorString()) << endl; dictionary["DONE"] = "error"; return; } -- cgit v1.2.3 From d74d0a3b304b32f793cfd745c632c404a1c39b42 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 5 Jan 2015 14:31:47 +0100 Subject: Disable ANGLE builds for MSVC <= 2008. Task-number: QTBUG-43475 Change-Id: If0f68ed6823564fd67219812334256936031f35f Reviewed-by: Laszlo Agocs --- tools/configure/configureapp.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'tools/configure') diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 105a9ef04c..6e9d4aa80b 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2101,6 +2101,11 @@ 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_NET2003 && compiler <= CC_NET2008) { + if (errorMessage) + *errorMessage = QStringLiteral("ANGLE is no longer supported for this compiler."); + return false; + } if (compiler < CC_NET2012 && directXSdk.isEmpty()) { if (errorMessage) *errorMessage = QStringLiteral("There is no Direct X SDK installed or the environment variable \"DXSDK_DIR\" is not set."); -- cgit v1.2.3