1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add -qpa option on Windows

Browse Source 
Done-by: owolff
Done-by: Friedemann Kleint
This commit is contained in:
Marius Storm-Olsen 2011-05-23 09:19:56 -05:00
parent e79846298b
commit 5c739ef709
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/configure/configureapp.cpp
View File

@ -1077,6 +1077,8 @@ void Configure::parseCmdLine()
sybase = configCmdLine.at(i); sybase = configCmdLine.at(i);
} else if (configCmdLine.at(i).startsWith("SYBASE_LIBS=")) { } else if (configCmdLine.at(i).startsWith("SYBASE_LIBS=")) {
sybaseLibs = configCmdLine.at(i); 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")){ 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-script] [-script] [-no-scripttools] [-scripttools]\n"
"[-no-webkit] [-webkit] [-webkit-debug]\n" "[-no-webkit] [-webkit] [-webkit-debug]\n"
"[-graphicssystem raster|opengl|openvg]\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"); desc("Installation options:\n\n");
@ -3035,6 +3037,8 @@ void Configure::generateCachefile()
configStream << " incredibuild_xge"; configStream << " incredibuild_xge";
if (dictionary["PLUGIN_MANIFESTS"] == "no") if (dictionary["PLUGIN_MANIFESTS"] == "no")
configStream << " no_plugin_manifest"; configStream << " no_plugin_manifest";
if (dictionary["QPA"] == "yes")
configStream << " qpa";
if (dictionary.contains("SYMBIAN_DEFFILES")) { if (dictionary.contains("SYMBIAN_DEFFILES")) {
if (dictionary["SYMBIAN_DEFFILES"] == "yes") { if (dictionary["SYMBIAN_DEFFILES"] == "yes") {
@ -3154,6 +3158,9 @@ void Configure::generateConfigfiles()
tmpStream << "#define Q_LITTLE_ENDIAN 1234" << endl; tmpStream << "#define Q_LITTLE_ENDIAN 1234" << endl;
tmpStream << "#define Q_BYTE_ORDER Q_LITTLE_ENDIAN" << 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 << endl << "// Compile time features" << endl;
tmpStream << "#define QT_ARCH_" << dictionary["ARCHITECTURE"].toUpper() << endl; tmpStream << "#define QT_ARCH_" << dictionary["ARCHITECTURE"].toUpper() << endl;
if (dictionary["GRAPHICS_SYSTEM"] == "runtime" && dictionary["RUNTIME_SYSTEM"] != "runtime") if (dictionary["GRAPHICS_SYSTEM"] == "runtime" && dictionary["RUNTIME_SYSTEM"] != "runtime")