Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 305905
Collapse All | Expand All

(-)conf/conf4.cpp (+3 lines)
Lines 868-873 Link Here
868
	if(!success)
868
	if(!success)
869
		return 1;
869
		return 1;
870
870
871
	if(qc_getenv("QC_SKIP_QMAKE") == "Y")
872
		return 0;
873
871
	// run qmake on the project file
874
	// run qmake on the project file
872
	QStringList args;
875
	QStringList args;
873
	if(!qmakespec.isEmpty())
876
	if(!qmakespec.isEmpty())
(-)src/qconf.cpp (+6 lines)
Lines 441-446 Link Here
441
			const ConfOpt &i = *it;
441
			const ConfOpt &i = *it;
442
			str += QString("export %1\n").arg(i.var);
442
			str += QString("export %1\n").arg(i.var);
443
		}
443
		}
444
		str += "export QC_SKIP_QMAKE\n"; // export verbose flag also
444
		str += "export QC_VERBOSE\n"; // export verbose flag also
445
		str += "export QC_VERBOSE\n"; // export verbose flag also
445
446
446
		str += genDoQConf();
447
		str += genDoQConf();
Lines 585-590 Link Here
585
		"This script creates necessary configuration files to build/install.\n\n";
586
		"This script creates necessary configuration files to build/install.\n\n";
586
587
587
		QList<ConfUsageOpt> list = optsToUsage(mainopts);
588
		QList<ConfUsageOpt> list = optsToUsage(mainopts);
589
		list += ConfUsageOpt("skip-qmake",  "",   "Only generate qt progect files and skip qmake run.");
588
		list += ConfUsageOpt("verbose",  "",   "Show extra configure output.");
590
		list += ConfUsageOpt("verbose",  "",   "Show extra configure output.");
589
		list += ConfUsageOpt("help",   "",     "This help text.");
591
		list += ConfUsageOpt("help",   "",     "This help text.");
590
		str += genUsageSection("Main options:", list);
592
		str += genUsageSection("Main options:", list);
Lines 750-755 Link Here
750
		"	case \"$1\" in\n";
752
		"	case \"$1\" in\n";
751
753
752
		char argsfooter[] =
754
		char argsfooter[] =
755
		"		--skip-qmake)\n"
756
		"			QC_SKIP_QMAKE=\"Y\"\n"
757
		"			shift\n"
758
		"			;;\n"
753
		"		--verbose)\n"
759
		"		--verbose)\n"
754
		"			QC_VERBOSE=\"Y\"\n"
760
		"			QC_VERBOSE=\"Y\"\n"
755
		"			shift\n"
761
		"			shift\n"

Return to bug 305905