whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove the [-no]-qmake command line argument in configure.exe 

Qt will not build with -no-qmake.

Change-Id: I0fb5995d53fd3d6e4e5bd956929ce43432fb526d
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
bb10
Lars Knoll 2016-07-07 16:53:13 +02:00 committed by Oswald Buddenhagen
parent 81f54e5dd8
commit 734e0c636e
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/configure/configureapp.cpp
View File

@ -132,7 +132,6 @@ Configure::Configure(int& argc, char** argv) : verbose(0)
dictionary[ "QMAKESPEC_FROM" ] = "env";
}
dictionary[ "BUILD_QMAKE" ] = "yes";
dictionary[ "WIDGETS" ] = "yes";
dictionary[ "GUI" ] = "yes";
dictionary[ "RTTI" ] = "yes";
@ -834,11 +833,6 @@ void Configure::parseCmdLine()
else if (configCmdLine.at(i) == "-no-syncqt")
dictionary[ "SYNCQT" ] = "no";
else if (configCmdLine.at(i) == "-no-qmake")
dictionary[ "BUILD_QMAKE" ] = "no";
else if (configCmdLine.at(i) == "-qmake")
dictionary[ "BUILD_QMAKE" ] = "yes";
else if (configCmdLine.at(i) == "-qtnamespace") {
++i;
if (i == argCount)
@ -1748,8 +1742,6 @@ bool Configure::displayHelp()
desc("PLUGIN_MANIFESTS", "no", "-no-plugin-manifests", "Do not embed manifests in plugins.");
desc("PLUGIN_MANIFESTS", "yes", "-plugin-manifests", "Embed manifests in plugins.\n");
desc("BUILD_QMAKE", "no", "-no-qmake", "Do not compile qmake.");
desc("BUILD_QMAKE", "yes", "-qmake", "Compile qmake.\n");
desc( "-qreal [double|float]", "typedef qreal to the specified type. The default is double.\n"
"Note that changing this flag affects binary compatibility.\n");
@ -3827,7 +3819,7 @@ void Configure::generateQConfigCpp()
void Configure::buildQmake()
{
if (dictionary[ "BUILD_QMAKE" ] == "yes") {
{
QStringList args;
// Build qmake