From b7d86139772c3ce662ea7f092658699d351bbb1d Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 19 Jun 2014 11:46:10 +0200 Subject: nuke -process/-fully-process/-dont-process options [ChangeLog][configure] The -process/-fully-process/-dont-process options have been removed due to being unnecessary and counterproductive. -fully-process has always been broken to a degree under unix (and since 5.0 under windows) - rcc isn't built before running qmake -r, so the dependencies are unreliable (and there are many warning messages from qmake). also, it is a lot slower nowadays, as qmake -r is not parallelized. -dont-process doesn't make any sense any more - even if you don't need the Makefile for some obscure reason, the time spent on creating it is not relevant without the recursion. this leaves -process as the only option. Task-number: QTBUG-36955 Change-Id: Ifd3949d9ff773780646c6f65db1629e1c19e53d2 Reviewed-by: Joerg Bornemann --- tools/configure/configureapp.cpp | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) (limited to 'tools') diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 9820ce1636..7c2a38292b 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -158,7 +158,6 @@ Configure::Configure(int& argc, char** argv) dictionary[ "EMBEDDED" ] = "no"; dictionary[ "BUILD_QMAKE" ] = "yes"; dictionary[ "QMAKE_INTERNAL" ] = "no"; - dictionary[ "PROCESS" ] = "partial"; dictionary[ "WIDGETS" ] = "yes"; dictionary[ "GUI" ] = "yes"; dictionary[ "RTTI" ] = "yes"; @@ -943,13 +942,6 @@ void Configure::parseCmdLine() else if (configCmdLine.at(i) == "-qmake") dictionary[ "BUILD_QMAKE" ] = "yes"; - else if (configCmdLine.at(i) == "-dont-process") - dictionary[ "PROCESS" ] = "no"; - else if (configCmdLine.at(i) == "-process") - dictionary[ "PROCESS" ] = "partial"; - else if (configCmdLine.at(i) == "-fully-process") - dictionary[ "PROCESS" ] = "full"; - else if (configCmdLine.at(i) == "-qtnamespace") { ++i; if (i == argCount) @@ -1948,10 +1940,6 @@ bool Configure::displayHelp() desc("BUILD_QMAKE", "no", "-no-qmake", "Do not compile qmake."); desc("BUILD_QMAKE", "yes", "-qmake", "Compile qmake.\n"); - desc("PROCESS", "partial", "-process", "Generate only top-level Makefile."); - desc("PROCESS", "full", "-fully-process", "Generate Makefiles for the entire Qt tree."); - desc("PROCESS", "no", "-dont-process", "Do not generate Makefiles.\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"); @@ -4157,7 +4145,6 @@ void Configure::appendMakeItem(int inList, const QString &item) void Configure::generateMakefiles() { - if (dictionary[ "PROCESS" ] != "no") { QString pwd = QDir::currentPath(); { QString sourcePathMangled = sourcePath; @@ -4167,24 +4154,15 @@ void Configure::generateMakefiles() buildPathMangled = QFileInfo(buildPath).path(); } QStringList args; - args << buildPath + "/bin/qmake"; - if (dictionary[ "PROCESS" ] == "full") - args << "-r"; - args << sourcePathMangled; + args << buildPath + "/bin/qmake" << sourcePathMangled; QDir::setCurrent(buildPathMangled); - cout << "Generating Makefiles...\n"; if (int exitCode = Environment::execute(args, QStringList(), QStringList())) { cout << "Qmake failed, return code " << exitCode << endl << endl; dictionary[ "DONE" ] = "error"; } } QDir::setCurrent(pwd); - } else { - cout << "Processing of project files have been disabled." << endl; - cout << "Only use this option if you really know what you're doing." << endl << endl; - return; - } } void Configure::showSummary() -- cgit v1.2.3