AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

properly declare the host tools as such in the project files

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

Change-Id: I399d87145d31d25e29951b6acd96387a3c7282f0
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
This commit is contained in:
Oswald Buddenhagen 2012-02-03 22:13:12 +01:00
parent 14bbab09c1
commit 7d8578418d
10 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
configure vendored
View File

@ -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,23 +6325,21 @@ 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) \$@
FORCE:
EOF
else
if [ "$OPT_VERBOSE" = "yes" ]; then
echo " (`basename $SPEC`)"
echo "$QMAKE" $QMAKE_ARGS -o "$OUTDIR" "$a"
else
echo
if [ "$OPT_VERBOSE" = "yes" ]; then
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

1
qmake/qmake.pro
View File

@ -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

1
src/tools/bootstrap/bootstrap.pro
View File

@ -1,3 +1,4 @@
option(host_build)
TEMPLATE = lib
TARGET = bootstrap
CONFIG += staticlib

1
src/tools/moc/moc.pro
View File

@ -1,3 +1,4 @@
option(host_build)
TEMPLATE = app
TARGET = moc

2
src/tools/qdbuscpp2xml/qdbuscpp2xml.pro
View File

@ -1,4 +1,4 @@
option(host_build)
TEMPLATE = app
TARGET = qdbuscpp2xml

1
src/tools/qdbusxml2cpp/qdbusxml2cpp.pro
View File

@ -1,3 +1,4 @@
option(host_build)
TEMPLATE = app
TARGET = qdbusxml2cpp

1
src/tools/qdoc/qdoc.pro
View File

@ -1,3 +1,4 @@
option(host_build)
TEMPLATE = app
TARGET = qdoc

1
src/tools/rcc/rcc.pro
View File

@ -1,3 +1,4 @@
option(host_build)
TEMPLATE = app
TARGET = rcc

1
src/tools/uic/uic.pro
View File

@ -1,3 +1,4 @@
option(host_build)
TEMPLATE = app
TARGET = uic

3
tools/configure/configureapp.cpp
View File

@ -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" ];