diff options
| author | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2011-05-23 09:19:56 -0500 |
|---|---|---|
| committer | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2011-05-23 09:19:56 -0500 |
| commit | 5c739ef709d218a2d712e6c62a92f7da013fa613 (patch) | |
| tree | cdc205c74a7c2c5155d7237f0746fe9d6df33f61 /tools | |
| parent | e79846298b7e80e713a75bd5f0f31b05270db5de (diff) | |
Add -qpa option on Windows
Done-by: owolff
Done-by: Friedemann Kleint
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/configure/configureapp.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index c4dd47b609..7bd132e602 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") |