diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-06-19 16:47:41 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-06-19 16:47:41 -0500 |
| commit | 1ecf57d6cfc4c0f3703eef6c90df9c3914baec6a (patch) | |
| tree | 9a0f14bc0aa25cc54bcbadc7aeae4b62e2a19ace /configure | |
| parent | 6dec101d43dcbd4195c47d54bd388db1a8d7230e (diff) | |
| download | tqt3-1ecf57d6cfc4c0f3703eef6c90df9c3914baec6a.tar.gz tqt3-1ecf57d6cfc4c0f3703eef6c90df9c3914baec6a.zip | |
Automated update from Qt3
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -1127,9 +1127,9 @@ else fi # binaries from qt -QMAKE_VARS="$QMAKE_VARS \"QMAKE_MOC=$outpath/bin/moc\"" -QMAKE_VARS="$QMAKE_VARS \"QMAKE_UIC=$outpath/bin/uic -L \$\$QT_BUILD_TREE/plugins\"" -QMAKE_VARS="$QMAKE_VARS \"QMAKE_QMAKE=$outpath/bin/qmake\"" +QMAKE_VARS="$QMAKE_VARS \"QMAKE_MOC=$outpath/bin/tqmoc\"" +QMAKE_VARS="$QMAKE_VARS \"QMAKE_UIC=$outpath/bin/tquic -L \$\$QT_BUILD_TREE/plugins\"" +QMAKE_VARS="$QMAKE_VARS \"QMAKE_QMAKE=$outpath/bin/tqmake\"" # hacky src line QMAKE_VARS="$QMAKE_VARS \"QMAKE_MOC_SRC=$outpath/src/moc\"" @@ -2264,7 +2264,7 @@ if [ "$OPT_SHADOW" = "yes" ]; then fi # build qmake -if true; then ###[ '!' -f "$outpath/bin/qmake" ]; +if true; then ###[ '!' -f "$outpath/bin/tqmake" ]; echo "Creating qmake. Please wait..." rm -f mkspecs/default ln -s `echo $QMAKESPEC | sed "s,^${relpath}/mkspecs/,,"` mkspecs/default @@ -3257,7 +3257,7 @@ else if [ -e "${relpath}/projects.pro" ]; then for mkfile in "${outpath}/Makefile" "${outpath}/GNUmakefile"; do [ -f "$mkfile" ] && chmod +w "$mkfile" - $outpath/bin/qmake "QT_PROJECTS=$QT_PROJECTS" ${relpath}/projects.pro -o $mkfile + $outpath/bin/tqmake "QT_PROJECTS=$QT_PROJECTS" ${relpath}/projects.pro -o $mkfile done fi fi @@ -3436,7 +3436,7 @@ for file in .projects .projects.3; do # All changes made to this file will be lost. all clean install qmake Makefile: FORCE - $outpath/bin/qmake $QMAKE_SWITCHES $QMAKE_SPEC_ARGS -o $OUTDIR $a + $outpath/bin/tqmake $QMAKE_SWITCHES $QMAKE_SPEC_ARGS -o $OUTDIR $a cd $OUTDIR \$(MAKE) \$@ @@ -3444,7 +3444,7 @@ FORCE: EOF else - EXEC="$outpath/bin/qmake $QMAKE_SWITCHES $QMAKE_SPEC_ARGS -o $OUTDIR $a" + EXEC="$outpath/bin/tqmake $QMAKE_SWITCHES $QMAKE_SPEC_ARGS -o $OUTDIR $a" if [ "$OPT_VERBOSE" = "yes" ]; then echo " (`basename $SPEC`)" if echo '\c' | grep '\c' >/dev/null; then |