From: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Date: Mon, 23 May 2011 14:19:56 +0000 (-0500)
Subject: Add -qpa option on Windows
X-Git-Tag: qt-v5.0.0-alpha1~4270^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5c739ef709d218a2d712e6c62a92f7da013fa613;p=profile%2Fivi%2Fqtbase.git

Add -qpa option on Windows

Done-by: owolff
Done-by: Friedemann Kleint
---

diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index c4dd47b..7bd132e 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -1077,6 +1077,8 @@ 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")){
@@ -1686,7 +1688,7 @@ bool Configure::displayHelp()
                     "[-no-script] [-script] [-no-scripttools] [-scripttools]\n"
                     "[-no-webkit] [-webkit] [-webkit-debug]\n"
                     "[-graphicssystem raster|opengl|openvg]\n"
-                    "[-no-directwrite] [-directwrite]\n\n", 0, 7);
+                    "[-no-directwrite] [-directwrite] [-qpa]\n\n", 0, 7);
 
         desc("Installation options:\n\n");
 
@@ -3035,6 +3037,8 @@ void Configure::generateCachefile()
             configStream << " incredibuild_xge";
         if (dictionary["PLUGIN_MANIFESTS"] == "no")
             configStream << " no_plugin_manifest";
+        if (dictionary["QPA"] == "yes")
+            configStream << " qpa";
 
         if (dictionary.contains("SYMBIAN_DEFFILES")) {
             if (dictionary["SYMBIAN_DEFFILES"] == "yes") {
@@ -3154,6 +3158,9 @@ void Configure::generateConfigfiles()
         tmpStream << "#define Q_LITTLE_ENDIAN 1234" << endl;
         tmpStream << "#define Q_BYTE_ORDER Q_LITTLE_ENDIAN" << endl;
 
+        if (dictionary[ "QPA" ] == "yes")
+            tmpStream << endl << "#define Q_WS_QPA" << endl;
+
         tmpStream << endl << "// Compile time features" << endl;
         tmpStream << "#define QT_ARCH_" << dictionary["ARCHITECTURE"].toUpper() << endl;
         if (dictionary["GRAPHICS_SYSTEM"] == "runtime" && dictionary["RUNTIME_SYSTEM"] != "runtime")