From 37cfcfb2b5c95e89dff40764412f11d8f5e286ea Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 4 Mar 2016 17:11:09 +0100 Subject: configure: Remove Windows CE. The platform has been removed in Qt 5.7. Task-number: QTBUG-51673 Change-Id: Id0b26e94bd8a673a35bfa5e02a5ba1c30891764a Reviewed-by: Joerg Bornemann --- tools/configure/configureapp.cpp | 177 ++------------------------------------- 1 file changed, 5 insertions(+), 172 deletions(-) diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index d43f700caa..f532ae82d0 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -52,7 +52,6 @@ QT_BEGIN_NAMESPACE enum Platforms { WINDOWS, - WINDOWS_CE, WINDOWS_RT, QNX, ANDROID, @@ -156,9 +155,6 @@ Configure::Configure(int& argc, char** argv) : verbose(0) dictionary[ "AVX2" ] = "auto"; dictionary[ "AVX512" ] = "auto"; dictionary[ "SYNCQT" ] = "auto"; - dictionary[ "CE_CRT" ] = "no"; - dictionary[ "CETEST" ] = "auto"; - dictionary[ "CE_SIGNATURE" ] = "no"; dictionary[ "AUDIO_BACKEND" ] = "auto"; dictionary[ "WMF_BACKEND" ] = "no"; dictionary[ "WMSDK" ] = "auto"; @@ -274,8 +270,6 @@ Configure::Configure(int& argc, char** argv) : verbose(0) dictionary[ "STYLE_WINDOWSXP" ] = "auto"; dictionary[ "STYLE_WINDOWSVISTA" ] = "auto"; dictionary[ "STYLE_FUSION" ] = "yes"; - dictionary[ "STYLE_WINDOWSCE" ] = "no"; - dictionary[ "STYLE_WINDOWSMOBILE" ] = "no"; dictionary[ "SQL_MYSQL" ] = "no"; dictionary[ "SQL_ODBC" ] = "no"; @@ -646,58 +640,12 @@ void Configure::parseCmdLine() else if (configCmdLine.at(i) == "-system-harfbuzz") dictionary[ "HARFBUZZ" ] = "system"; - // CE- C runtime -------------------------------------------- - else if (configCmdLine.at(i) == "-crt") { - ++i; - if (i == argCount) - break; - QDir cDir(configCmdLine.at(i)); - if (!cDir.exists()) - cout << "WARNING: Could not find directory (" << qPrintable(configCmdLine.at(i)) << ")for C runtime deployment" << endl; - else - dictionary[ "CE_CRT" ] = QDir::toNativeSeparators(cDir.absolutePath()); - } else if (configCmdLine.at(i) == "-qt-crt") { - dictionary[ "CE_CRT" ] = "yes"; - } else if (configCmdLine.at(i) == "-no-crt") { - dictionary[ "CE_CRT" ] = "no"; - } - // cetest --------------------------------------------------- - else if (configCmdLine.at(i) == "-no-cetest") { - dictionary[ "CETEST" ] = "no"; - dictionary[ "CETEST_REQUESTED" ] = "no"; - } else if (configCmdLine.at(i) == "-cetest") { - // although specified to use it, we stay at "auto" state - // this is because checkAvailability() adds variables - // we need for crosscompilation; but remember if we asked - // for it. - dictionary[ "CETEST_REQUESTED" ] = "yes"; - } - // Qt/CE - signing tool ------------------------------------- - else if (configCmdLine.at(i) == "-signature") { - ++i; - if (i == argCount) - break; - QFileInfo info(configCmdLine.at(i)); - if (!info.exists()) - cout << "WARNING: Could not find signature file (" << qPrintable(configCmdLine.at(i)) << ")" << endl; - else - dictionary[ "CE_SIGNATURE" ] = QDir::toNativeSeparators(info.absoluteFilePath()); - } // Styles --------------------------------------------------- else if (configCmdLine.at(i) == "-qt-style-windows") dictionary[ "STYLE_WINDOWS" ] = "yes"; else if (configCmdLine.at(i) == "-no-style-windows") dictionary[ "STYLE_WINDOWS" ] = "no"; - else if (configCmdLine.at(i) == "-qt-style-windowsce") - dictionary[ "STYLE_WINDOWSCE" ] = "yes"; - else if (configCmdLine.at(i) == "-no-style-windowsce") - dictionary[ "STYLE_WINDOWSCE" ] = "no"; - else if (configCmdLine.at(i) == "-qt-style-windowsmobile") - dictionary[ "STYLE_WINDOWSMOBILE" ] = "yes"; - else if (configCmdLine.at(i) == "-no-style-windowsmobile") - dictionary[ "STYLE_WINDOWSMOBILE" ] = "no"; - else if (configCmdLine.at(i) == "-qt-style-windowsxp") dictionary[ "STYLE_WINDOWSXP" ] = "yes"; else if (configCmdLine.at(i) == "-no-style-windowsxp") @@ -1469,28 +1417,6 @@ void Configure::parseCmdLine() } } - // Ensure that the crt to be deployed can be found - if (dictionary["CE_CRT"] != QLatin1String("yes") && dictionary["CE_CRT"] != QLatin1String("no")) { - QDir cDir(dictionary["CE_CRT"]); - QStringList entries = cDir.entryList(); - bool hasDebug = entries.contains("msvcr80.dll"); - bool hasRelease = entries.contains("msvcr80d.dll"); - if ((dictionary["BUILDALL"] == "auto") && (!hasDebug || !hasRelease)) { - cout << "Could not find debug and release c-runtime." << endl; - cout << "You need to have msvcr80.dll and msvcr80d.dll in" << endl; - cout << "the path specified. Setting to -no-crt"; - dictionary[ "CE_CRT" ] = "no"; - } else if ((dictionary["BUILD"] == "debug") && !hasDebug) { - cout << "Could not find debug c-runtime (msvcr80d.dll) in the directory specified." << endl; - cout << "Setting c-runtime automatic deployment to -no-crt" << endl; - dictionary[ "CE_CRT" ] = "no"; - } else if ((dictionary["BUILD"] == "release") && !hasRelease) { - cout << "Could not find release c-runtime (msvcr80.dll) in the directory specified." << endl; - cout << "Setting c-runtime automatic deployment to -no-crt" << endl; - dictionary[ "CE_CRT" ] = "no"; - } - } - // Allow tests for private classes to be compiled against internal builds if (dictionary["BUILDDEV"] == "yes") { qtConfig << "private_tests"; @@ -1687,33 +1613,9 @@ void Configure::applySpecSpecifics() dictionary[ "ZLIB" ] = "qt"; dictionary[ "PCRE" ] = "qt"; dictionary[ "ICU" ] = "qt"; - dictionary[ "CE_CRT" ] = "yes"; dictionary[ "LARGE_FILE" ] = "no"; dictionary[ "ANGLE" ] = "yes"; dictionary[ "DYNAMICGL" ] = "no"; - } else if (dictionary.value("XQMAKESPEC").startsWith("wince")) { - dictionary[ "STYLE_WINDOWSXP" ] = "no"; - dictionary[ "STYLE_WINDOWSVISTA" ] = "no"; - dictionary[ "STYLE_FUSION" ] = "no"; - dictionary[ "STYLE_WINDOWSCE" ] = "yes"; - dictionary[ "STYLE_WINDOWSMOBILE" ] = "yes"; - dictionary[ "OPENGL" ] = "no"; - dictionary[ "RTTI" ] = "no"; - dictionary[ "SSE2" ] = "no"; - dictionary[ "SSE3" ] = "no"; - dictionary[ "SSSE3" ] = "no"; - dictionary[ "SSE4_1" ] = "no"; - dictionary[ "SSE4_2" ] = "no"; - dictionary[ "AVX" ] = "no"; - dictionary[ "AVX2" ] = "no"; - dictionary[ "AVX512" ] = "no"; - dictionary[ "CE_CRT" ] = "yes"; - dictionary[ "LARGE_FILE" ] = "no"; - dictionary[ "ANGLE" ] = "no"; - dictionary[ "DYNAMICGL" ] = "no"; - if (dictionary[ "XQMAKESPEC" ].startsWith("wincewm")) { - dictionary[ "MMX" ] = "yes"; - } } else if (dictionary.value("XQMAKESPEC").startsWith("linux")) { //TODO actually wrong. //TODO dictionary[ "STYLE_WINDOWSXP" ] = "no"; @@ -2064,8 +1966,6 @@ bool Configure::displayHelp() desc("STYLE_WINDOWSXP", "auto", "", " windowsxp", ' '); desc("STYLE_WINDOWSVISTA", "auto", "", " windowsvista", ' '); desc("STYLE_FUSION", "yes", "", " fusion", ' '); - desc("STYLE_WINDOWSCE", "yes", "", " windowsce", ' '); - desc("STYLE_WINDOWSMOBILE" , "yes", "", " windowsmobile\n", ' '); desc("NATIVE_GESTURES", "no", "-no-native-gestures", "Do not use native gestures on Windows 7."); desc("NATIVE_GESTURES", "yes", "-native-gestures", "Use native gestures on Windows 7.\n"); desc("MSVC_MP", "no", "-no-mp", "Do not use multiple processors for compiling with MSVC"); @@ -2075,15 +1975,6 @@ bool Configure::displayHelp() desc( "-saveconfig ", "Run configure and save the parameters in file configure_.cache."); desc( "-redo", "Run configure with the same parameters as last time.\n"); desc( "-v, -verbose", "Run configure tests with verbose output.\n"); - - // Qt\Windows CE only options go below here ----------------------------------------------------------------------------- - desc("Qt for Windows CE only:\n\n"); - desc("CE_CRT", "no", "-no-crt" , "Do not add the C runtime to default deployment rules."); - desc("CE_CRT", "yes", "-qt-crt", "Qt identifies C runtime during project generation."); - desc( "-crt ", "Specify path to C runtime used for project generation.\n"); - desc("CETEST", "no", "-no-cetest", "Do not compile Windows CE remote test application."); - desc("CETEST", "yes", "-cetest", "Compile Windows CE remote test application.\n"); - desc( "-signature ", "Use for signing the target project."); return true; } return false; @@ -2305,8 +2196,6 @@ bool Configure::checkAvailability(const QString &part) available = findFile("sqlite.h") && findFile("sqlite.lib"); else if (part == "SQL_IBASE") available = findFile("ibase.h") && (findFile("gds32_ms.lib") || findFile("gds32.lib")); - else if (part == "OPENGL_ES_2") - available = (dictionary.value("XQMAKESPEC").startsWith("wince")); else if (part == "SSE2") available = tryCompileProject("common/sse2"); else if (part == "SSE3") @@ -2327,20 +2216,7 @@ bool Configure::checkAvailability(const QString &part) available = dictionary.contains("XQMAKESPEC") && tryCompileProject("common/libproxy"); else if (part == "DBUS") available = findFile("dbus\\dbus.h"); - else if (part == "CETEST") { - const QString rapiHeader = QDir::toNativeSeparators(locateFile("rapi.h")); - const QString rapiLib = QDir::toNativeSeparators(locateFile("rapi.lib")); - available = (dictionary.value("XQMAKESPEC").startsWith("wince")) && !rapiHeader.isEmpty() && !rapiLib.isEmpty(); - if (available) { - dictionary[ "QT_CE_RAPI_INC" ] += QLatin1String("\"") + rapiHeader + QLatin1String("\""); - dictionary[ "QT_CE_RAPI_LIB" ] += QLatin1String("\"") + rapiLib + QLatin1String("\""); - } - else if (dictionary[ "CETEST_REQUESTED" ] == "yes") { - cout << "cetest could not be enabled: rapi.h and rapi.lib could not be found." << endl; - cout << "Make sure the environment is set up for compiling with ActiveSync." << endl; - dictionary[ "DONE" ] = "error"; - } - } else if (part == "INCREDIBUILD_XGE") { + else if (part == "INCREDIBUILD_XGE") { available = !QStandardPaths::findExecutable(QStringLiteral("BuildConsole.exe")).isEmpty() && !QStandardPaths::findExecutable(QStringLiteral("xgConsole.exe")).isEmpty(); } else if (part == "WMSDK") { @@ -2366,7 +2242,7 @@ bool Configure::checkAvailability(const QString &part) } else if (part == "QT_EVENTFD") { available = tryCompileProject("unix/eventfd"); } else if (part == "CUPS") { - available = (platform() != WINDOWS) && (platform() != WINDOWS_CE) && (platform() != WINDOWS_RT) && tryCompileProject("unix/cups"); + available = (platform() != WINDOWS) && (platform() != WINDOWS_RT) && tryCompileProject("unix/cups"); } else if (part == "STACK_PROTECTOR_STRONG") { available = (platform() == QNX) && compilerSupportsFlag("qcc -fstack-protector-strong"); } else if (part == "SLOG2") { @@ -2544,10 +2420,6 @@ void Configure::autoDetection() if (dictionary["WMSDK"] == "auto") dictionary["WMSDK"] = checkAvailability("WMSDK") ? "yes" : "no"; - // Qt/WinCE remote test application - if (dictionary["CETEST"] == "auto") - dictionary["CETEST"] = checkAvailability("CETEST") ? "yes" : "no"; - // Detection of IncrediBuild buildconsole if (dictionary["INCREDIBUILD_XGE"] == "auto") dictionary["INCREDIBUILD_XGE"] = checkAvailability("INCREDIBUILD_XGE") ? "yes" : "no"; @@ -2882,12 +2754,6 @@ void Configure::generateOutputVars() if (dictionary[ "STYLE_WINDOWSVISTA" ] == "yes") qmakeStyles += "windowsvista"; - if (dictionary[ "STYLE_WINDOWSCE" ] == "yes") - qmakeStyles += "windowsce"; - - if (dictionary[ "STYLE_WINDOWSMOBILE" ] == "yes") - qmakeStyles += "windowsmobile"; - if (dictionary[ "STYLE_ANDROID" ] == "yes") qmakeStyles += "android"; @@ -3016,9 +2882,6 @@ void Configure::generateOutputVars() else if (dictionary[ "DBUS" ] == "linked") qtConfig += "dbus dbus-linked"; - if (dictionary[ "CETEST" ] == "yes") - qtConfig += "cetest"; - // ### Vestige if (dictionary["AUDIO_BACKEND"] == "yes") qtConfig += "audio-backend"; @@ -3209,17 +3072,6 @@ void Configure::generateCachefile() if (dictionary["QT_XKBCOMMON"] == "no") moduleStream << "DEFINES += QT_NO_XKBCOMMON" << endl; - if (dictionary["CETEST"] == "yes") { - moduleStream << "QT_CE_RAPI_INC = " << formatPath(dictionary["QT_CE_RAPI_INC"]) << endl; - moduleStream << "QT_CE_RAPI_LIB = " << formatPath(dictionary["QT_CE_RAPI_LIB"]) << endl; - } - - moduleStream << "#Qt for Windows CE c-runtime deployment" << endl - << "QT_CE_C_RUNTIME = " << formatPath(dictionary["CE_CRT"]) << endl; - - if (dictionary["CE_SIGNATURE"] != QLatin1String("no")) - moduleStream << "DEFAULT_SIGNATURE=" << dictionary["CE_SIGNATURE"] << endl; - // embedded if (!dictionary["KBD_DRIVERS"].isEmpty()) moduleStream << "kbd-drivers += "<< dictionary["KBD_DRIVERS"]<