diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-10 12:48:01 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-10 15:31:45 +0200 |
commit | 143c4d3e13a430b951f4f4f8c28db14303f80605 (patch) | |
tree | 2b89637b93fc7d81c674106008566010f986d67c /tools | |
parent | a7ed81b557d593a8ddb43b71bf4bbf3b44ead070 (diff) | |
parent | e5337ad1b1fb02873ce7b5ca8db45f6fd8063352 (diff) |
Merge remote-tracking branch 'origin/master' into api_changes
Conflicts:
configure
src/widgets/styles/qwindowsxpstyle.cpp
tests/auto/gui/kernel/qwindow/qwindow.pro
tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
Change-Id: I624b6d26abce9874c610c04954c1c45bc074bef3
Diffstat (limited to 'tools')
-rw-r--r-- | tools/configure/configureapp.cpp | 45 |
1 files changed, 24 insertions, 21 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index a45f396ebe..23b19ecf6e 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -176,7 +176,7 @@ Configure::Configure(int& argc, char** argv) } } - defaultBuildParts << QStringLiteral("libs") << QStringLiteral("examples") << QStringLiteral("tests"); + defaultBuildParts << QStringLiteral("libs") << QStringLiteral("examples"); dictionary[ "QT_SOURCE_TREE" ] = fixSeparators(sourcePath); dictionary[ "QT_BUILD_TREE" ] = fixSeparators(buildPath); dictionary[ "QT_INSTALL_PREFIX" ] = fixSeparators(installPath); @@ -211,7 +211,7 @@ Configure::Configure(int& argc, char** argv) dictionary[ "WMSDK" ] = "auto"; dictionary[ "DIRECTSHOW" ] = "no"; dictionary[ "V8SNAPSHOT" ] = "auto"; - dictionary[ "DECLARATIVE_DEBUG" ]= "yes"; + dictionary[ "QML_DEBUG" ] = "yes"; dictionary[ "PLUGIN_MANIFESTS" ] = "yes"; dictionary[ "DIRECTWRITE" ] = "no"; @@ -824,10 +824,10 @@ void Configure::parseCmdLine() dictionary[ "PHONON_BACKEND" ] = "yes"; } else if (configCmdLine.at(i) == "-phonon-wince-ds9") { dictionary[ "DIRECTSHOW" ] = "yes"; - } else if (configCmdLine.at(i) == "-no-declarative-debug") { - dictionary[ "DECLARATIVE_DEBUG" ] = "no"; - } else if (configCmdLine.at(i) == "-declarative-debug") { - dictionary[ "DECLARATIVE_DEBUG" ] = "yes"; + } else if (configCmdLine.at(i) == "-no-qml-debug") { + dictionary[ "QML_DEBUG" ] = "no"; + } else if (configCmdLine.at(i) == "-qml-debug") { + dictionary[ "QML_DEBUG" ] = "yes"; } else if (configCmdLine.at(i) == "-no-plugin-manifests") { dictionary[ "PLUGIN_MANIFESTS" ] = "no"; } else if (configCmdLine.at(i) == "-plugin-manifests") { @@ -906,8 +906,6 @@ void Configure::parseCmdLine() sybase = configCmdLine.at(i); } else if (configCmdLine.at(i).startsWith("SYBASE_LIBS=")) { sybaseLibs = configCmdLine.at(i); - } else if (configCmdLine.at(i) == "-qpa") { - dictionary["QPA"] = "yes"; } else if ((configCmdLine.at(i) == "-override-version") || (configCmdLine.at(i) == "-version-override")){ @@ -937,7 +935,7 @@ void Configure::parseCmdLine() ++i; if (i == argCount) break; - nobuildParts.removeAll(configCmdLine.at(i)); + nobuildParts.append(configCmdLine.at(i)); } // Directories ---------------------------------------------- @@ -1457,7 +1455,7 @@ bool Configure::displayHelp() "[-no-multimedia] [-multimedia] [-no-audio-backend] [-audio-backend]\n" "[-no-script] [-script] [-no-scripttools] [-scripttools]\n" "[-no-webkit] [-webkit] [-webkit-debug]\n" - "[-no-directwrite] [-directwrite] [-qpa] [-no-widgets] [-icu]\n\n", 0, 7); + "[-no-directwrite] [-directwrite] [-no-widgets] [-icu]\n\n", 0, 7); desc("Installation options:\n\n"); @@ -1606,8 +1604,8 @@ bool Configure::displayHelp() desc("PHONON_BACKEND","yes","-phonon-backend", "Compile in the platform-specific Phonon backend-plugin"); desc("AUDIO_BACKEND", "no","-no-audio-backend", "Do not compile in the platform audio backend into QtMultimedia"); desc("AUDIO_BACKEND", "yes","-audio-backend", "Compile in the platform audio backend into QtMultimedia"); - desc("DECLARATIVE_DEBUG", "no", "-no-declarative-debug", "Do not build the declarative debugging support"); - desc("DECLARATIVE_DEBUG", "yes", "-declarative-debug", "Build the declarative debugging support"); + desc("QML_DEBUG", "no", "-no-qml-debug", "Do not build the QML debugging support"); + desc("QML_DEBUG", "yes", "-qml-debug", "Build the QML debugging support"); desc("DIRECTWRITE", "no", "-no-directwrite", "Do not build support for DirectWrite font rendering"); desc("DIRECTWRITE", "yes", "-directwrite", "Build support for DirectWrite font rendering (experimental, requires DirectWrite availability on target systems, e.g. Windows Vista with Platform Update, Windows 7, etc.)"); @@ -1957,8 +1955,8 @@ void Configure::autoDetection() dictionary["DBUS"] = checkAvailability("DBUS") ? "yes" : "no"; if (dictionary["V8SNAPSHOT"] == "auto") dictionary["V8SNAPSHOT"] = (dictionary["V8"] == "yes") && checkAvailability("V8SNAPSHOT") ? "yes" : "no"; - if (dictionary["DECLARATIVE_DEBUG"] == "auto") - dictionary["DECLARATIVE_DEBUG"] = dictionary["DECLARATIVE"] == "yes" ? "yes" : "no"; + if (dictionary["QML_DEBUG"] == "auto") + dictionary["QML_DEBUG"] = dictionary["QML"] == "yes" ? "yes" : "no"; if (dictionary["AUDIO_BACKEND"] == "auto") dictionary["AUDIO_BACKEND"] = checkAvailability("AUDIO_BACKEND") ? "yes" : "no"; if (dictionary["WMSDK"] == "auto") @@ -2215,8 +2213,12 @@ void Configure::generateOutputVars() qmakeConfig += dictionary[ "BUILD" ]; dictionary[ "QMAKE_OUTDIR" ] = dictionary[ "BUILD" ]; - if (buildParts.isEmpty()) + if (buildParts.isEmpty()) { buildParts = defaultBuildParts; + + if (dictionary["BUILDDEV"] == "yes") + buildParts += "tests"; + } while (!nobuildParts.isEmpty()) buildParts.removeAll(nobuildParts.takeFirst()); if (!buildParts.contains("libs")) @@ -2596,14 +2598,15 @@ void Configure::generateQConfigPri() configStream << " incredibuild_xge"; if (dictionary["PLUGIN_MANIFESTS"] == "no") configStream << " no_plugin_manifest"; - if (dictionary["QPA"] == "yes") - configStream << " qpa"; if (dictionary["CROSS_COMPILE"] == "yes") configStream << " cross_compile"; if (dictionary["DIRECTWRITE"] == "yes") configStream << "directwrite"; + // ### For compatibility only, should be removed later. + configStream << " qpa"; + configStream << endl; configStream << "QT_ARCH = " << dictionary["QT_ARCH"] << endl; configStream << "QT_HOST_ARCH = " << dictionary["QT_HOST_ARCH"] << endl; @@ -2740,8 +2743,8 @@ void Configure::generateConfigfiles() tmpStream << endl; } - if (dictionary[ "QPA" ] == "yes") - tmpStream << endl << "#define Q_WS_QPA" << endl; + // ### For compatibility only, should be removed later. + tmpStream << endl << "#define Q_WS_QPA" << endl; tmpStream << endl << "// Compile time features" << endl; @@ -2781,7 +2784,7 @@ void Configure::generateConfigfiles() } if (dictionary["OPENSSL"] == "linked") qconfigList += "QT_LINKED_OPENSSL"; if (dictionary["DBUS"] == "no") qconfigList += "QT_NO_DBUS"; - if (dictionary["DECLARATIVE_DEBUG"] == "no") qconfigList += "QDECLARATIVE_NO_DEBUG_PROTOCOL"; + if (dictionary["QML_DEBUG"] == "no") qconfigList += "QT_QML_NO_DEBUGGER"; if (dictionary["FREETYPE"] == "no") qconfigList += "QT_NO_FREETYPE"; if (dictionary["NATIVE_GESTURES"] == "no") qconfigList += "QT_NO_NATIVE_GESTURES"; @@ -3000,7 +3003,7 @@ void Configure::displayConfig() cout << "OpenSSL support............." << dictionary[ "OPENSSL" ] << endl; cout << "QtDBus support.............." << dictionary[ "DBUS" ] << endl; cout << "QtWidgets module support...." << dictionary[ "WIDGETS" ] << endl; - cout << "Declarative debugging......." << dictionary[ "DECLARATIVE_DEBUG" ] << endl; + cout << "QML debugging..............." << dictionary[ "QML_DEBUG" ] << endl; cout << "DirectWrite support........." << dictionary[ "DIRECTWRITE" ] << endl << endl; cout << "Third Party Libraries:" << endl; |