properly declare the host tools as such in the project files

don't mess with the qmake cmdline args any more.

Change-Id: I399d87145d31d25e29951b6acd96387a3c7282f0
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>

10 files changed, 14 insertions, 16 deletions

diff --git a/configure b/configure
index a4180bccc4..9e17df68ce 100755
--- a/configure
+++ b/configure
@@ -6290,13 +6290,11 @@ for file in .projects .projects.3; do
             if [ "$CFG_NOPROCESS" = "yes" ] || [ "$XPLATFORM_MINGW" != "yes" ]; then
                 continue
             fi
-            SPEC=$XQMAKESPEC ;;
+            ;;
         */qmake/qmake.pro) continue ;;
-        *tools/bootstrap*|*tools/moc*|*tools/rcc*|*tools/uic*|*tools/qdoc*|*tools/qdbusxml2cpp*|*tools/qdbuscpp2xml*) SPEC=$QMAKESPEC ;;
+        *tools/bootstrap*|*tools/moc*|*tools/rcc*|*tools/uic*|*tools/qdoc*|*tools/qdbusxml2cpp*|*tools/qdbuscpp2xml*) ;;
         *) if [ "$CFG_NOPROCESS" = "yes" ]; then
               continue
-           else
-              SPEC=$XQMAKESPEC
            fi;;
         esac
         dir=`dirname "$a" | sed -e "s;$sepath;.;g"`
@@ -6310,11 +6308,9 @@ for file in .projects .projects.3; do
             [ "$OPT_VERBOSE" = "yes" ] && echo "  skipping $a"
             continue;
         fi
-        QMAKE_SPEC_ARGS="-spec $SPEC"
         echo $ECHO_N "  for $a$ECHO_C"
 
         QMAKE="$outpath/bin/qmake"
-	QMAKE_ARGS="$QMAKE_SWITCHES $QMAKE_SPEC_ARGS"
         if [ "$file" = ".projects.3" ]; then
             echo " (fast)"
 
@@ -6329,7 +6325,7 @@ EOF
             cat >>"${OUTDIR}/Makefile" <<EOF
 QMAKE = "$QMAKE"
 all clean install qmake first Makefile: FORCE
-	\$(QMAKE) $QMAKE_ARGS -o "$OUTDIR" "$a"
+	\$(QMAKE) $QMAKE_SWITCHES -o "$OUTDIR" "$a"
 	cd "$OUTDIR"
 	\$(MAKE) \$@
 
@@ -6337,15 +6333,13 @@ FORCE:
 
 EOF
         else
+            echo
             if [ "$OPT_VERBOSE" = "yes" ]; then
-                echo " (`basename $SPEC`)"
-                echo "$QMAKE" $QMAKE_ARGS -o "$OUTDIR" "$a"
-	    else
-		echo
+                echo "$QMAKE" $QMAKE_SWITCHES -o "$OUTDIR" "$a"
             fi
 
             [ -f "${OUTDIR}/Makefile" ] && chmod +w "${OUTDIR}/Makefile"
-            QTDIR="$outpath" "$QMAKE" $QMAKE_ARGS -o "$OUTDIR" "$a"
+            QTDIR="$outpath" "$QMAKE" $QMAKE_SWITCHES -o "$OUTDIR" "$a"
        fi
     done
 done
diff --git a/qmake/qmake.pro b/qmake/qmake.pro
index 5a5010ff6a..0693d9a4ac 100644
--- a/qmake/qmake.pro
+++ b/qmake/qmake.pro
@@ -3,6 +3,7 @@
 #once you are boot strapped though, the qmake.pro will offer better coverage of a
 #platform than either of the generic makefiles
 
+option(host_build)
 CONFIG += console bootstrap
 CONFIG -= qt shared app_bundle uic
 DEFINES += QT_BUILD_QMAKE QT_BOOTSTRAPPED
diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro
index 239f9e58b3..8f29393be2 100644
--- a/src/tools/bootstrap/bootstrap.pro
+++ b/src/tools/bootstrap/bootstrap.pro
@@ -1,3 +1,4 @@
+option(host_build)
 TEMPLATE = lib
 TARGET = bootstrap
 CONFIG += staticlib
diff --git a/src/tools/moc/moc.pro b/src/tools/moc/moc.pro
index 62d692844f..b40f21396d 100644
--- a/src/tools/moc/moc.pro
+++ b/src/tools/moc/moc.pro
@@ -1,3 +1,4 @@
+option(host_build)
 TEMPLATE	= app
 TARGET		= moc
 
diff --git a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro
index 33f7937c5b..ae1edf07cd 100644
--- a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro
+++ b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro
@@ -1,4 +1,4 @@
-
+option(host_build)
 TEMPLATE = app
 TARGET = qdbuscpp2xml
 
diff --git a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro
index 5c430fdfb1..ac7183775a 100644
--- a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro
+++ b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro
@@ -1,3 +1,4 @@
+option(host_build)
 TEMPLATE = app
 TARGET = qdbusxml2cpp
 
diff --git a/src/tools/qdoc/qdoc.pro b/src/tools/qdoc/qdoc.pro
index 348593d74a..37ec63ab04 100644
--- a/src/tools/qdoc/qdoc.pro
+++ b/src/tools/qdoc/qdoc.pro
@@ -1,3 +1,4 @@
+option(host_build)
 TEMPLATE = app
 TARGET = qdoc
 
diff --git a/src/tools/rcc/rcc.pro b/src/tools/rcc/rcc.pro
index e87ef605b9..8debb03398 100644
--- a/src/tools/rcc/rcc.pro
+++ b/src/tools/rcc/rcc.pro
@@ -1,3 +1,4 @@
+option(host_build)
 TEMPLATE = app
 TARGET = rcc
 
diff --git a/src/tools/uic/uic.pro b/src/tools/uic/uic.pro
index 0acc6e77c8..d03645eb45 100644
--- a/src/tools/uic/uic.pro
+++ b/src/tools/uic/uic.pro
@@ -1,3 +1,4 @@
+option(host_build)
 TEMPLATE = app
 TARGET = uic
 
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index ff2744397d..9633bb6862 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -3642,7 +3642,6 @@ void Configure::generateMakefiles()
                     printf("Generating Makefiles...\n");
                     generate = false; // Now Makefiles will be done
                 }
-                // don't pass -spec - .qmake.cache has it already
                 args << "-r";
                 args << (sourcePath + "/qtbase.pro");
                 args << "-o";
@@ -3682,8 +3681,6 @@ void Configure::generateMakefiles()
                     cout << "For " << qPrintable(dirPath + projectName) << endl;
                     args << "-o";
                     args << it->target;
-                    args << "-spec";
-                    args << spec;
                     if (!dictionary[ "QMAKEADDITIONALARGS" ].isEmpty())
                         args << dictionary[ "QMAKEADDITIONALARGS" ];