[patch] qconf-skip-qmake.patch

qconf-skip-qmake.patch (text/plain), 1.37 KB, created by Peter Volkov (RETIRED) on 2010-09-18 13:07:08 UTC

Index: conf/conf4.cpp
===================================================================
--- conf/conf4.cpp	(revision 791)
+++ conf/conf4.cpp	(working copy)
@@ -868,6 +868,9 @@
 	if(!success)
 		return 1;
 
+	if(qc_getenv("QC_SKIP_QMAKE") == "Y")
+		return 0;
+
 	// run qmake on the project file
 	QStringList args;
 	if(!qmakespec.isEmpty())
Index: src/qconf.cpp
===================================================================
--- src/qconf.cpp	(revision 791)
+++ src/qconf.cpp	(working copy)
@@ -441,6 +441,7 @@
 			const ConfOpt &i = *it;
 			str += QString("export %1\n").arg(i.var);
 		}
+		str += "export QC_SKIP_QMAKE\n"; // export verbose flag also
 		str += "export QC_VERBOSE\n"; // export verbose flag also
 
 		str += genDoQConf();
@@ -585,6 +586,7 @@
 		"This script creates necessary configuration files to build/install.\n\n";
 
 		QList<ConfUsageOpt> list = optsToUsage(mainopts);
+		list += ConfUsageOpt("skip-qmake",  "",   "Only generate qt progect files and skip qmake run.");
 		list += ConfUsageOpt("verbose",  "",   "Show extra configure output.");
 		list += ConfUsageOpt("help",   "",     "This help text.");
 		str += genUsageSection("Main options:", list);
@@ -750,6 +752,10 @@
 		"	case \"$1\" in\n";
 
 		char argsfooter[] =
+		"		--skip-qmake)\n"
+		"			QC_SKIP_QMAKE=\"Y\"\n"
+		"			shift\n"
+		"			;;\n"
 		"		--verbose)\n"
 		"			QC_VERBOSE=\"Y\"\n"
 		"			shift\n"