summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorDebao Zhang <dbzhang800@gmail.com>2012-03-28 10:20:09 -0700
committerQt by Nokia <qt-info@nokia.com>2012-03-30 00:38:31 +0200
commit94f7d70a4ba2378e111d0bf231f5a143fd8588af (patch)
tree8f907be5c727b80766319e583bba1d7ffdefe910 /tools
parentdbb9d96bdbd3ebfa0140740e1561430a4cc01b13 (diff)
Remove qpa option form configure.exe
Change-Id: Ib35b65be43f76ac4babf6e7dd3b0763274f0ab8c Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/configure/configureapp.cpp13
1 files changed, 6 insertions, 7 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 1b25911d8c..6ed419d05e 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -927,8 +927,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")){
@@ -1482,7 +1480,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");
@@ -2653,14 +2651,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;
@@ -2797,8 +2796,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;