FCL/sf/mw/qt: comparison tools/configure/configureapp.cpp

equal deleted inserted replaced

-:ef0373b55136
+:758a864f9613
 dictionary[ "QT3SUPPORT" ]      = "yes";
 dictionary[ "ACCESSIBILITY" ]   = "yes";
 dictionary[ "OPENGL" ]          = "yes";
 dictionary[ "OPENVG" ]          = "no";
-dictionary[ "IPV6" ]            = "yes"; // Always, dynamicly loaded
+dictionary[ "IPV6" ]            = "yes"; // Always, dynamically loaded
 dictionary[ "OPENSSL" ]         = "auto";
 dictionary[ "DBUS" ]            = "auto";
 dictionary[ "S60" ]             = "yes";
 dictionary[ "STYLE_WINDOWS" ]   = "yes";
 dictionary[ "QMAKESPEC" ] = tmp;
 dictionary[ "INCREDIBUILD_XGE" ] = "auto";
 dictionary[ "LTCG" ]            = "no";
 dictionary[ "NATIVE_GESTURES" ] = "yes";
+dictionary[ "MSVC_MP" ] = "no";
 }
 Configure::~Configure()
 {
 for (int i=0; i<3; ++i) {
 dictionary[ "LTCG" ] = "yes";
 }
 else if (configCmdLine.at(i) == "-no-ltcg") {
 dictionary[ "LTCG" ] = "no";
 }
+else if (configCmdLine.at(i) == "-mp") {
+dictionary[ "MSVC_MP" ] = "yes";
+}
+else if (configCmdLine.at(i) == "-no-mp") {
+dictionary[ "MSVC_MP" ] = "no";
+}
 #endif
 else if (configCmdLine.at(i) == "-platform") {
 ++i;
 if (i == argCount)
 else if (configCmdLine.at(i) == "-qtnamespace") {
 ++i;
 if (i == argCount)
 break;
-qmakeDefines += "QT_NAMESPACE="+configCmdLine.at(i);
 dictionary[ "QT_NAMESPACE" ] = configCmdLine.at(i);
 } else if (configCmdLine.at(i) == "-qtlibinfix") {
 ++i;
 if (i == argCount)
 break;
 qmakeLibs += QString("-l" + configCmdLine.at(i));
 } else if (configCmdLine.at(i).startsWith("OPENSSL_LIBS=")) {
 opensslLibs = configCmdLine.at(i);
 } else if (configCmdLine.at(i).startsWith("PSQL_LIBS=")) {
 psqlLibs = configCmdLine.at(i);
+} else if (configCmdLine.at(i).startsWith("SYBASE=")) {
+sybase = configCmdLine.at(i);
+} else if (configCmdLine.at(i).startsWith("SYBASE_LIBS=")) {
+sybaseLibs = configCmdLine.at(i);
 }
 else if ((configCmdLine.at(i) == "-override-version") || (configCmdLine.at(i) == "-version-override")){
 ++i;
 if (i == argCount)
 if (system == QLatin1String("raster")
 || system == QLatin1String("opengl")
 || system == QLatin1String("openvg")
 || system == QLatin1String("runtime"))
 dictionary["GRAPHICS_SYSTEM"] = configCmdLine.at(i);
+}
+else if (configCmdLine.at(i) == "-runtimegraphicssystem") {
+++i;
+if (i == argCount)
+break;
+dictionary["RUNTIME_SYSTEM"] = configCmdLine.at(i);
 }
 else if (configCmdLine.at(i).indexOf(QRegExp("^-(en|dis)able-")) != -1) {
 // Scan to see if any specific modules and drivers are enabled or disabled
 for (QStringList::Iterator module = modules.begin(); module != modules.end(); ++module) {
 dictionary[ "STYLE_S60" ]           = "yes";
 dictionary[ "FREETYPE" ]            = "no";
 dictionary[ "QT3SUPPORT" ]          = "no";
 dictionary[ "OPENGL" ]              = "no";
 dictionary[ "OPENSSL" ]             = "yes";
+// We accidently enabled IPv6 for Qt Symbian in 4.6.x. However the underlying OpenC does not fully support IPV6.
+// Therefore for 4.7.1 and following we disable it until OpenC either supports it or we have the native Qt
+// symbian socket engine.
+dictionary[ "IPV6" ]                = "no";
 dictionary[ "STL" ]                 = "yes";
 dictionary[ "EXCEPTIONS" ]          = "yes";
 dictionary[ "RTTI" ]                = "yes";
 dictionary[ "ARCHITECTURE" ]        = "symbian";
 dictionary[ "3DNOW" ]               = "no";
 "[-no-openssl] [-no-dbus] [-dbus] [-dbus-linked] [-platform <spec>]\n"
 "[-qtnamespace <namespace>] [-qtlibinfix <infix>] [-no-phonon]\n"
 "[-phonon] [-no-phonon-backend] [-phonon-backend]\n"
 "[-no-multimedia] [-multimedia] [-no-audio-backend] [-audio-backend]\n"
 "[-no-script] [-script] [-no-scripttools] [-scripttools]\n"
-"[-no-webkit] [-webkit] [-graphicssystem raster|opengl|openvg|runtime]\n\n", 0, 7);
+"[-no-webkit] [-webkit] [-graphicssystem raster|opengl|openvg]\n\n", 0, 7);
 desc("Installation options:\n\n");
 #if !defined(EVAL)
 /*
 #endif
 desc(                   "-graphicssystem <sys>",   "Specify which graphicssystem should be used.\n"
 "Available values for <sys>:");
 desc("GRAPHICS_SYSTEM", "raster", "",  "  raster - Software rasterizer", ' ');
 desc("GRAPHICS_SYSTEM", "opengl", "",  "  opengl - Using OpenGL acceleration, experimental!", ' ');
-desc("GRAPHICS_SYSTEM", "openvg", "",  "  openvg - Using OpenVG acceleration, experimental!", ' ');
+desc("GRAPHICS_SYSTEM", "openvg", "",  "  openvg - Using OpenVG acceleration, experimental!\n", ' ');
-desc("GRAPHICS_SYSTEM", "runtime", "", "  runtime - Runtime switching of graphics sytems", ' ');
 desc(                   "-help, -h, -?",        "Display this information.\n");
 #if !defined(EVAL)
 // 3rd party stuff options go below here --------------------------------------------------------------------------------
 desc("STYLE_WINDOWSCE", "yes", "",              "  windowsce", ' ');
 desc("STYLE_WINDOWSMOBILE" , "yes", "",         "  windowsmobile", ' ');
 desc("STYLE_S60" , "yes", "",                   "  s60\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.");
+desc("MSVC_MP", "no", "-no-mp",                 "Do not use multiple processors for compiling with MSVC");
+desc("MSVC_MP", "yes", "-mp",                   "Use multiple processors for compiling with MSVC (-MP)");
 /*      We do not support -qconfig on Windows yet
 desc(                   "-qconfig <local>",     "Use src/tools/qconfig-local.h rather than the default.\nPossible values for local:");
 for (int i=0; i<allConfigs.size(); ++i)
 ++i;
 }
 available = (paths.size() == 0);
 if (!available) {
-if (epocRoot.isNull() || epocRoot == "")
+if (epocRoot.isEmpty())
 epocRoot = "<empty string>";
 cout << endl
 << "The QtMultimedia audio backend will not be built because required" << endl
 << "support for CMMFDevSound was not found in the SDK." << endl
 << "The SDK which was examined was located at the following path:" << endl
 qtConfig += "multimedia";
 if (dictionary["AUDIO_BACKEND"] == "yes")
 qtConfig += "audio-backend";
 }
-if (dictionary["WEBKIT"] == "yes")
+if (dictionary["WEBKIT"] == "yes") {
-qtConfig += "webkit";
+// This include takes care of adding "webkit" to QT_CONFIG.
+QString src = sourcePath + "/src/3rdparty/webkit/WebKit/qt/qt_webkit_version.pri";
+QString dst = buildPath + "/mkspecs/modules/qt_webkit_version.pri";
+QFile::remove(dst);
+QFile::copy(src, dst);
+}
 if (dictionary["DECLARATIVE"] == "yes") {
 if (dictionary[ "SCRIPT" ] == "no") {
 cout << "QtDeclarative was requested, but it can't be built due to QtScript being "
 "disabled." << endl;
 << "large"
 << "full";
 QString set_config = dictionary["QCONFIG"];
 if (possible_configs.contains(set_config)) {
-foreach(QString cfg, possible_configs) {
+foreach (const QString &cfg, possible_configs) {
 qtConfig += (cfg + "-config");
 if (cfg == set_config)
 break;
 }
 }
 else
 qmakeVars += QString("OPENSSL_LIBS    = -lssleay32 -llibeay32");
 }
 if (!psqlLibs.isEmpty())
 qmakeVars += QString("QT_LFLAGS_PSQL=") + psqlLibs.section("=", 1);
+{
+QStringList lflagsTDS;
+if (!sybase.isEmpty())
+lflagsTDS += QString("-L") + fixSeparators(sybase.section("=", 1) + "/lib");
+if (!sybaseLibs.isEmpty())
+lflagsTDS += sybaseLibs.section("=", 1);
+if (!lflagsTDS.isEmpty())
+qmakeVars += QString("QT_LFLAGS_TDS=") + lflagsTDS.join(" ");
+}
 if (!qmakeSql.isEmpty())
 qmakeVars += QString("sql-drivers    += ") + qmakeSql.join(" ");
 if (!qmakeSqlPlugins.isEmpty())
 qmakeVars += QString("sql-plugins    += ") + qmakeSqlPlugins.join(" ");
 if (!qmakeStyles.isEmpty())
 if (cacheFile.open(QFile::WriteOnly | QFile::Text)) { // Truncates any existing file.
 QTextStream cacheStream(&cacheFile);
 for (QStringList::Iterator var = qmakeVars.begin(); var != qmakeVars.end(); ++var) {
 cacheStream << (*var) << endl;
 }
-cacheStream << "CONFIG         += " << qmakeConfig.join(" ") << " incremental create_prl link_prl depend_includepath QTDIR_build" << endl;
+cacheStream << "CONFIG         += " << qmakeConfig.join(" ") << " incremental msvc_mp create_prl link_prl depend_includepath QTDIR_build" << endl;
 QStringList buildParts;
 buildParts << "libs" << "tools" << "examples" << "demos" << "docs" << "translations";
-foreach(QString item, disabledBuildParts) {
+foreach (const QString &item, disabledBuildParts) {
 buildParts.removeAll(item);
 }
 cacheStream << "QT_BUILD_PARTS  = " << buildParts.join(" ") << endl;
 QString targetSpec = dictionary.contains("XQMAKESPEC") ? dictionary[ "XQMAKESPEC" ] : dictionary[ "QMAKESPEC" ];
 else
 configStream << " static";
 if (dictionary[ "LTCG" ] == "yes")
 configStream << " ltcg";
+if (dictionary[ "MSVC_MP" ] == "yes")
+configStream << " msvc_mp";
 if (dictionary[ "STL" ] == "yes")
 configStream << " stl";
 if (dictionary[ "EXCEPTIONS" ] == "yes")
 configStream << " exceptions";
 if (dictionary[ "EXCEPTIONS" ] == "no")
 }
 if (!dictionary["QT_NAMESPACE"].isEmpty()) {
 configStream << "#namespaces" << endl << "QT_NAMESPACE = " << dictionary["QT_NAMESPACE"] << endl;
 }
-configStream << "#modules" << endl << "for(mod,$$list($$files($$[QMAKE_MKSPECS]/modules/qt_*.pri))):include($$mod)" << endl;
 configStream.flush();
 configFile.close();
 }
 }
 #endif
 else
 tmpStream << "#define Q_BYTE_ORDER Q_LITTLE_ENDIAN" << endl;
 tmpStream << endl << "// Compile time features" << endl;
 tmpStream << "#define QT_ARCH_" << dictionary["ARCHITECTURE"].toUpper() << endl;
+if (dictionary["GRAPHICS_SYSTEM"] == "runtime" && dictionary["RUNTIME_SYSTEM"] != "runtime")
+tmpStream << "#define QT_DEFAULT_RUNTIME_SYSTEM \"" << dictionary["RUNTIME_SYSTEM"] << "\"" << endl;
 QStringList qconfigList;
 if (dictionary["STL"] == "no")                qconfigList += "QT_NO_STL";
 if (dictionary["STYLE_WINDOWS"] != "yes")     qconfigList += "QT_NO_STYLE_WINDOWS";
 if (dictionary["STYLE_PLASTIQUE"] != "yes")   qconfigList += "QT_NO_STYLE_PLASTIQUE";
 if (dictionary["STYLE_CLEANLOOKS"] != "yes")   qconfigList += "QT_NO_STYLE_CLEANLOOKS";
 {
 // Check for keyboard, mouse, gfx.
 QStringList kbdDrivers = dictionary["KBD_DRIVERS"].split(" ");;
 QStringList allKbdDrivers;
 allKbdDrivers<<"tty"<<"usb"<<"sl5000"<<"yopy"<<"vr41xx"<<"qvfb"<<"um";
-foreach(QString kbd, allKbdDrivers) {
+foreach (const QString &kbd, allKbdDrivers) {
 if (!kbdDrivers.contains(kbd))
 tmpStream<<"#define QT_NO_QWS_KBD_"<<kbd.toUpper()<<endl;
 }
 QStringList mouseDrivers = dictionary["MOUSE_DRIVERS"].split(" ");
 QStringList allMouseDrivers;
 allMouseDrivers << "pc"<<"bus"<<"linuxtp"<<"yopy"<<"vr41xx"<<"tslib"<<"qvfb";
-foreach(QString mouse, allMouseDrivers) {
+foreach (const QString &mouse, allMouseDrivers) {
 if (!mouseDrivers.contains(mouse))
 tmpStream<<"#define QT_NO_QWS_MOUSE_"<<mouse.toUpper()<<endl;
 }
 QStringList gfxDrivers = dictionary["GFX_DRIVERS"].split(" ");
 QStringList allGfxDrivers;
 allGfxDrivers<<"linuxfb"<<"transformed"<<"qvfb"<<"vnc"<<"multiscreen"<<"ahi";
-foreach(QString gfx, allGfxDrivers) {
+foreach (const QString &gfx, allGfxDrivers) {
 if (!gfxDrivers.contains(gfx))
 tmpStream<<"#define QT_NO_QWS_"<<gfx.toUpper()<<endl;
 }
 tmpStream<<"#define Q_WS_QWS"<<endl;
 QStringList depths = dictionary[ "QT_QWS_DEPTH" ].split(" ");
-foreach(QString depth, depths)
+foreach (const QString &depth, depths)
 tmpStream<<"#define QT_QWS_DEPTH_"+depth<<endl;
 }
 if (dictionary[ "QT_CUPS" ] == "no")
 tmpStream<<"#define QT_NO_CUPS"<<endl;
 QString toolSourcePath = sourcePath + "/" + hostToolsDirs.at(i);
 // generate Makefile
 QStringList args;
 args << QDir::toNativeSeparators(buildPath + "/bin/qmake");
-args << "-spec" << dictionary["QMAKESPEC"] << "-r";
+// override .qmake.cache because we are not cross-building these.
+// we need a full path so that a build with -prefix will still find it.
+args << "-spec" << QDir::toNativeSeparators(buildPath + "/mkspecs/" + dictionary["QMAKESPEC"]);
+args << "-r";
 args << "-o" << QDir::toNativeSeparators(toolBuildPath + "/Makefile");
 QDir().mkpath(toolBuildPath);
 QDir::setCurrent(toolSourcePath);
 int exitCode = Environment::execute(args, QStringList(), QStringList());
 printf("Generating Visual Studio project files...\n");
 } else {
 printf("Generating Makefiles...\n");
 generate = false; // Now Makefiles will be done
 }
-args << "-spec";
+// don't pass -spec - .qmake.cache has it already
-args << spec;
 args << "-r";
 args << (sourcePath + "/projects.pro");
 args << "-o";
 args << buildPath;
 if (!dictionary[ "QMAKEADDITIONALARGS" ].isEmpty())

changeset 37	758a864f9613
parent 33	3e2da88830cd