CFG_ALSA=auto
CFG_PULSEAUDIO=auto
CFG_COREWLAN=auto
-CFG_NOPROCESS=no
+CFG_PROCESS=yes
CFG_ICU=auto
CFG_FORCE_ASSERTS=no
CFG_PCRE=auto
CFG_SILENT="$VAL"
;;
dont-process)
- CFG_NOPROCESS=yes
+ CFG_PROCESS=no
;;
process)
- CFG_NOPROCESS=no
+ CFG_PROCESS=partial
+ ;;
+ fully-process)
+ CFG_PROCESS=full
;;
audio-backend)
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
* -shared ............ Create and use shared Qt libraries.
-static ............ Create and use static Qt libraries.
+ * -process ........... Generate only a top-level Makefile.
+ -fully-process ..... Generate Makefiles for the entire Qt tree.
+ -dont-process ...... Do not generate any Makefiles.
+
* -no-fast ........... Configure Qt normally by generating Makefiles for all
project files.
-fast .............. Configure Qt quickly by generating Makefiles only for
# build makefiles based on the configuration
#-------------------------------------------------------------------------------
-if [ "$CFG_NOPROCESS" != "yes" ]; then
- echo "Creating makefiles. Please wait..."
- "$outpath/bin/qmake" -r ${OPT_FAST+CONFIG+=fast} "$relpath"
- echo "Done"
+if [ "$CFG_PROCESS" != "no" ]; then
+
+ if [ "$CFG_PROCESS" = "full" ]; then
+ echo "Creating makefiles. Please wait..."
+ "$outpath/bin/qmake" -r "$relpath"
+ echo "Done"
+ else
+ "$outpath/bin/qmake" "$relpath"
+ fi
if [ "$OPT_FAST" = "yes" ]; then
PART_ROOTS=
dictionary[ "VCPROJFILES" ] = "yes";
dictionary[ "QMAKE_INTERNAL" ] = "no";
dictionary[ "FAST" ] = "no";
- dictionary[ "NOPROCESS" ] = "no";
+ dictionary[ "PROCESS" ] = "partial";
dictionary[ "WIDGETS" ] = "yes";
dictionary[ "RTTI" ] = "yes";
dictionary[ "SSE2" ] = "auto";
dictionary[ "BUILD_QMAKE" ] = "yes";
else if (configCmdLine.at(i) == "-dont-process")
- dictionary[ "NOPROCESS" ] = "yes";
+ dictionary[ "PROCESS" ] = "no";
else if (configCmdLine.at(i) == "-process")
- dictionary[ "NOPROCESS" ] = "no";
+ dictionary[ "PROCESS" ] = "partial";
+ else if (configCmdLine.at(i) == "-fully-process")
+ dictionary[ "PROCESS" ] = "full";
else if (configCmdLine.at(i) == "-no-qmake-deps")
dictionary[ "DEPENDENCIES" ] = "no";
desc("BUILD_QMAKE", "no", "-no-qmake", "Do not compile qmake.");
desc("BUILD_QMAKE", "yes", "-qmake", "Compile qmake.\n");
- desc("NOPROCESS", "yes", "-dont-process", "Do not generate Makefiles/Project files. This will override -no-fast if specified.");
- desc("NOPROCESS", "no", "-process", "Generate Makefiles/Project files.\n");
+ desc("PROCESS", "partial", "-process", "Generate top-level Makefiles/Project files.\n");
+ desc("PROCESS", "full", "-fully-process", "Generate Makefiles/Project files for the entire Qt tree.\n");
+ desc("PROCESS", "no", "-dont-process", "Do not generate Makefiles/Project files. This will override -no-fast if specified.");
desc("RTTI", "no", "-no-rtti", "Do not compile runtime type information.");
desc("RTTI", "yes", "-rtti", "Compile runtime type information.\n");
void Configure::findProjects(const QString& dirName)
{
- if (dictionary[ "NOPROCESS" ] == "no") {
+ if (dictionary[ "PROCESS" ] != "no") {
QDir dir(dirName);
QString entryName;
int makeListNumber;
void Configure::generateMakefiles()
{
- if (dictionary[ "NOPROCESS" ] == "no") {
+ if (dictionary[ "PROCESS" ] != "no") {
QString spec = dictionary.contains("XQMAKESPEC") ? dictionary[ "XQMAKESPEC" ] : dictionary[ "QMAKESPEC" ];
if (spec != "win32-msvc.net" && !spec.startsWith("win32-msvc2") && !spec.startsWith(QLatin1String("wince")))
dictionary[ "VCPROJFILES" ] = "no";
printf("Generating Makefiles...\n");
generate = false; // Now Makefiles will be done
}
- args << "-r";
+ if (dictionary[ "PROCESS" ] == "full")
+ args << "-r";
args << (sourcePath + "/qtbase.pro");
args << "-o";
args << buildPath;