From 44d415b334b00fb28809a49e3b20bae2b27c669a Mon Sep 17 00:00:00 2001 From: Stanislav Ionascu Date: Thu, 18 Apr 2013 22:34:46 +0200 Subject: Configure: Provide -no-gui option for Windows host builds. Change-Id: I5f1fd9c39db31410c6e17f3e0dd90a27d35428ed Reviewed-by: Oswald Buddenhagen --- tools/configure/configureapp.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'tools') diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index dc11c0d0a2..a18aac3209 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -214,6 +214,7 @@ Configure::Configure(int& argc, char** argv) dictionary[ "QMAKE_INTERNAL" ] = "no"; dictionary[ "PROCESS" ] = "partial"; dictionary[ "WIDGETS" ] = "yes"; + dictionary[ "GUI" ] = "yes"; dictionary[ "RTTI" ] = "yes"; dictionary[ "STRIP" ] = "yes"; dictionary[ "SSE2" ] = "auto"; @@ -811,6 +812,11 @@ void Configure::parseCmdLine() else if (configCmdLine.at(i) == "-no-widgets") dictionary[ "WIDGETS" ] = "no"; + else if (configCmdLine.at(i) == "-gui") + dictionary[ "GUI" ] = "yes"; + else if (configCmdLine.at(i) == "-no-gui") + dictionary[ "GUI" ] = "no"; + else if (configCmdLine.at(i) == "-rtti") dictionary[ "RTTI" ] = "yes"; else if (configCmdLine.at(i) == "-no-rtti") @@ -1724,6 +1730,7 @@ bool Configure::displayHelp() desc( "-skip ", "Exclude an entire module from the build.\n"); desc("WIDGETS", "no", "-no-widgets", "Disable Qt Widgets module.\n"); + desc("GUI", "no", "-no-gui", "Disable Qt GUI module.\n"); desc("ACCESSIBILITY", "no", "-no-accessibility", "Disable accessibility support.\n"); desc( "", "Disabling accessibility is not recommended, as it will break QStyle\n" @@ -2494,6 +2501,9 @@ void Configure::generateOutputVars() if (dictionary[ "WIDGETS" ] == "no") qtConfig += "no-widgets"; + if (dictionary[ "GUI" ] == "no") + qtConfig += "no-gui"; + // Compression -------------------------------------------------- if (dictionary[ "ZLIB" ] == "qt") qtConfig += "zlib"; @@ -3327,6 +3337,7 @@ void Configure::generateConfigfiles() if (dictionary["ACCESSIBILITY"] == "no") qconfigList += "QT_NO_ACCESSIBILITY"; if (dictionary["WIDGETS"] == "no") qconfigList += "QT_NO_WIDGETS"; + if (dictionary["GUI"] == "no") qconfigList += "QT_NO_GUI"; if (dictionary["OPENGL"] == "no") qconfigList += "QT_NO_OPENGL"; if (dictionary["OPENVG"] == "no") qconfigList += "QT_NO_OPENVG"; if (dictionary["OPENSSL"] == "no") { @@ -3516,6 +3527,7 @@ void Configure::displayConfig() sout << "OpenSSL support............." << dictionary[ "OPENSSL" ] << endl; sout << "Qt D-Bus support............" << dictionary[ "DBUS" ] << endl; sout << "Qt Widgets module support..." << dictionary[ "WIDGETS" ] << endl; + sout << "Qt GUI module support......." << dictionary[ "GUI" ] << endl; sout << "QML debugging..............." << dictionary[ "QML_DEBUG" ] << endl; sout << "DirectWrite support........." << dictionary[ "DIRECTWRITE" ] << endl; sout << "Use system proxies.........." << dictionary[ "SYSTEM_PROXIES" ] << endl << endl; -- cgit v1.2.3