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 | |
| parent | 6dec101d43dcbd4195c47d54bd388db1a8d7230e (diff) | |
| download | tqt3-1ecf57d6.tar.gz tqt3-1ecf57d6.zip | |
Automated update from Qt3
71 files changed, 140 insertions, 140 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 diff --git a/mkspecs/aix-g++-64/qmake.conf b/mkspecs/aix-g++-64/qmake.conf index 5bd9b7cf..400711e3 100755 --- a/mkspecs/aix-g++-64/qmake.conf +++ b/mkspecs/aix-g++-64/qmake.conf @@ -63,8 +63,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -lpthreads -QMAKE_MOC = $(QTDIR)/bin/moc -QMAKE_UIC = $(QTDIR)/bin/uic +QMAKE_MOC = $(QTDIR)/bin/tqmoc +QMAKE_UIC = $(QTDIR)/bin/tquic QMAKE_AR = ar -X 64 cqs QMAKE_RANLIB = diff --git a/mkspecs/aix-g++/qmake.conf b/mkspecs/aix-g++/qmake.conf index dacf6231..e65e94eb 100644 --- a/mkspecs/aix-g++/qmake.conf +++ b/mkspecs/aix-g++/qmake.conf @@ -63,8 +63,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -lpthreads -QMAKE_MOC = $(QTDIR)/bin/moc -QMAKE_UIC = $(QTDIR)/bin/uic +QMAKE_MOC = $(QTDIR)/bin/tqmoc +QMAKE_UIC = $(QTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/aix-xlc-64/qmake.conf b/mkspecs/aix-xlc-64/qmake.conf index e084af27..721f8b06 100644 --- a/mkspecs/aix-xlc-64/qmake.conf +++ b/mkspecs/aix-xlc-64/qmake.conf @@ -72,8 +72,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -lpthreads -QMAKE_MOC = $(QTDIR)/bin/moc -QMAKE_UIC = $(QTDIR)/bin/uic +QMAKE_MOC = $(QTDIR)/bin/tqmoc +QMAKE_UIC = $(QTDIR)/bin/tquic QMAKE_AR = ar -X64 cq QMAKE_RANLIB = ranlib -X64 diff --git a/mkspecs/aix-xlc/qmake.conf b/mkspecs/aix-xlc/qmake.conf index 7e8cb56f..92782e38 100644 --- a/mkspecs/aix-xlc/qmake.conf +++ b/mkspecs/aix-xlc/qmake.conf @@ -70,8 +70,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -lpthreads -QMAKE_MOC = $(QTDIR)/bin/moc -QMAKE_UIC = $(QTDIR)/bin/uic +QMAKE_MOC = $(QTDIR)/bin/tqmoc +QMAKE_UIC = $(QTDIR)/bin/tquic QMAKE_AR = ar cq QMAKE_RANLIB = ranlib diff --git a/mkspecs/bsdi-g++/qmake.conf b/mkspecs/bsdi-g++/qmake.conf index d4e647af..7088c8ee 100644 --- a/mkspecs/bsdi-g++/qmake.conf +++ b/mkspecs/bsdi-g++/qmake.conf @@ -66,8 +66,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -QMAKE_MOC = $(QTDIR)/bin/moc -QMAKE_UIC = $(QTDIR)/bin/uic +QMAKE_MOC = $(QTDIR)/bin/tqmoc +QMAKE_UIC = $(QTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/cygwin-g++/qmake.conf b/mkspecs/cygwin-g++/qmake.conf index 04c5aa51..843b3521 100644 --- a/mkspecs/cygwin-g++/qmake.conf +++ b/mkspecs/cygwin-g++/qmake.conf @@ -68,8 +68,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $(QTDIR)/bin/moc -QMAKE_UIC = $(QTDIR)/bin/uic +QMAKE_MOC = $(QTDIR)/bin/tqmoc +QMAKE_UIC = $(QTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/darwin-g++/qmake.conf b/mkspecs/darwin-g++/qmake.conf index 324c7f5f..14afcbab 100644 --- a/mkspecs/darwin-g++/qmake.conf +++ b/mkspecs/darwin-g++/qmake.conf @@ -72,8 +72,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -QMAKE_MOC = $(QTDIR)/bin/moc -QMAKE_UIC = $(QTDIR)/bin/uic +QMAKE_MOC = $(QTDIR)/bin/tqmoc +QMAKE_UIC = $(QTDIR)/bin/tquic QMAKE_AR = ar cq QMAKE_RANLIB = ranlib -s diff --git a/mkspecs/dgux-g++/qmake.conf b/mkspecs/dgux-g++/qmake.conf index 769e6cda..1832a224 100644 --- a/mkspecs/dgux-g++/qmake.conf +++ b/mkspecs/dgux-g++/qmake.conf @@ -59,8 +59,8 @@ QMAKE_LIBS_QT = -lqt QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu -QMAKE_MOC = $(QTDIR)/bin/moc -QMAKE_UIC = $(QTDIR)/bin/uic +QMAKE_MOC = $(QTDIR)/bin/tqmoc +QMAKE_UIC = $(QTDIR)/bin/tquic QMAKE_AR = ar cq QMAKE_RANLIB = diff --git a/mkspecs/freebsd-g++/qmake.conf b/mkspecs/freebsd-g++/qmake.conf index 0f878455..60ca7e36 100644 --- a/mkspecs/freebsd-g++/qmake.conf +++ b/mkspecs/freebsd-g++/qmake.conf @@ -64,8 +64,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -QMAKE_MOC = $(QTDIR)/bin/moc -QMAKE_UIC = $(QTDIR)/bin/uic +QMAKE_MOC = $(QTDIR)/bin/tqmoc +QMAKE_UIC = $(QTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/freebsd-g++34/qmake.conf b/mkspecs/freebsd-g++34/qmake.conf index 59d89b57..29096ff4 100644 --- a/mkspecs/freebsd-g++34/qmake.conf +++ b/mkspecs/freebsd-g++34/qmake.conf @@ -64,8 +64,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -QMAKE_MOC = $(QTDIR)/bin/moc -QMAKE_UIC = $(QTDIR)/bin/uic +QMAKE_MOC = $(QTDIR)/bin/tqmoc +QMAKE_UIC = $(QTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/freebsd-icc/qmake.conf b/mkspecs/freebsd-icc/qmake.conf index 80667418..34d95b48 100644 --- a/mkspecs/freebsd-icc/qmake.conf +++ b/mkspecs/freebsd-icc/qmake.conf @@ -82,8 +82,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -QMAKE_MOC = $(QTDIR)/bin/moc -QMAKE_UIC = $(QTDIR)/bin/uic +QMAKE_MOC = $(QTDIR)/bin/tqmoc +QMAKE_UIC = $(QTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/hpux-acc-64/qmake.conf b/mkspecs/hpux-acc-64/qmake.conf index 8c325ca9..5ceb160e 100644 --- a/mkspecs/hpux-acc-64/qmake.conf +++ b/mkspecs/hpux-acc-64/qmake.conf @@ -108,8 +108,8 @@ QMAKE_LIBS_OPENGL_QT = -lGL -lXmu -lXt QMAKE_LIBS_THREAD = -lpthread QMAKE_LIBS_YACC = -ly -QMAKE_MOC = $(QTDIR)/bin/moc -QMAKE_UIC = $(QTDIR)/bin/uic +QMAKE_MOC = $(QTDIR)/bin/tqmoc +QMAKE_UIC = $(QTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/hpux-acc-o64/qmake.conf b/mkspecs/hpux-acc-o64/qmake.conf index 45fde3cd..d3bda52c 100644 --- a/mkspecs/hpux-acc-o64/qmake.conf +++ b/mkspecs/hpux-acc-o64/qmake.conf @@ -107,8 +107,8 @@ QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -lpthread QMAKE_LIBS_YACC = -ly -QMAKE_MOC = $(QTDIR)/bin/moc -QMAKE_UIC = $(QTDIR)/bin/uic +QMAKE_MOC = $(QTDIR)/bin/tqmoc +QMAKE_UIC = $(QTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/hpux-acc/qmake.conf b/mkspecs/hpux-acc/qmake.conf index 5273843f..9d66d871 100644 --- a/mkspecs/hpux-acc/qmake.conf +++ b/mkspecs/hpux-acc/qmake.conf @@ -87,8 +87,8 @@ QMAKE_LIBS_OPENGL_QT = -lGL -lXt QMAKE_LIBS_THREAD = -lpthread QMAKE_LIBS_YACC = -ly -QMAKE_MOC = $(QTDIR)/bin/moc -QMAKE_UIC = $(QTDIR)/bin/uic +QMAKE_MOC = $(QTDIR)/bin/tqmoc +QMAKE_UIC = $(QTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/hpux-cc/qmake.conf b/mkspecs/hpux-cc/qmake.conf index fc2e8b4c..732b09c3 100644 --- a/mkspecs/hpux-cc/qmake.conf +++ b/mkspecs/hpux-cc/qmake.conf @@ -82,8 +82,8 @@ QMAKE_LIBS_QT = -lqt QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu -QMAKE_MOC = $(QTDIR)/bin/moc -QMAKE_UIC = $(QTDIR)/bin/uic +QMAKE_MOC = $(QTDIR)/bin/tqmoc +QMAKE_UIC = $(QTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/hpux-g++-64/qmake.conf b/mkspecs/hpux-g++-64/qmake.conf index f2a98849..2333f94c 100644 --- a/mkspecs/hpux-g++-64/qmake.conf +++ b/mkspecs/hpux-g++-64/qmake.conf @@ -68,8 +68,8 @@ QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -lpthread QMAKE_LIBS_YACC = -ly -QMAKE_MOC = $(QTDIR)/bin/moc -QMAKE_UIC = $(QTDIR)/bin/uic +QMAKE_MOC = $(QTDIR)/bin/tqmoc +QMAKE_UIC = $(QTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/hpux-g++/qmake.conf b/mkspecs/hpux-g++/qmake.conf index fc05c571..51294044 100644 --- a/mkspecs/hpux-g++/qmake.conf +++ b/mkspecs/hpux-g++/qmake.conf @@ -69,8 +69,8 @@ QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -lpthread QMAKE_LIBS_YACC = -ly -QMAKE_MOC = $(QTDIR)/bin/moc -QMAKE_UIC = $(QTDIR)/bin/uic +QMAKE_MOC = $(QTDIR)/bin/tqmoc +QMAKE_UIC = $(QTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/hpuxi-acc-32/qmake.conf b/mkspecs/hpuxi-acc-32/qmake.conf index 3f528665..4d150b0b 100644 --- a/mkspecs/hpuxi-acc-32/qmake.conf +++ b/mkspecs/hpuxi-acc-32/qmake.conf @@ -106,8 +106,8 @@ QMAKE_LIBS_OPENGL_QT = -lGL -lXmu -lXt QMAKE_LIBS_THREAD = -lpthread QMAKE_LIBS_YACC = -ly -QMAKE_MOC = $(QTDIR)/bin/moc -QMAKE_UIC = $(QTDIR)/bin/uic +QMAKE_MOC = $(QTDIR)/bin/tqmoc +QMAKE_UIC = $(QTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/hpuxi-acc-64/qmake.conf b/mkspecs/hpuxi-acc-64/qmake.conf index 9b17fe56..5c05e668 100644 --- a/mkspecs/hpuxi-acc-64/qmake.conf +++ b/mkspecs/hpuxi-acc-64/qmake.conf @@ -106,8 +106,8 @@ QMAKE_LIBS_OPENGL_QT = -lGL -lXmu -lXt QMAKE_LIBS_THREAD = -lpthread QMAKE_LIBS_YACC = -ly -QMAKE_MOC = $(QTDIR)/bin/moc -QMAKE_UIC = $(QTDIR)/bin/uic +QMAKE_MOC = $(QTDIR)/bin/tqmoc +QMAKE_UIC = $(QTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/hurd-g++/qmake.conf b/mkspecs/hurd-g++/qmake.conf index 9502b962..9bfddc23 100644 --- a/mkspecs/hurd-g++/qmake.conf +++ b/mkspecs/hurd-g++/qmake.conf @@ -67,8 +67,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -QMAKE_MOC = $(QTDIR)/bin/moc -QMAKE_UIC = $(QTDIR)/bin/uic +QMAKE_MOC = $(QTDIR)/bin/tqmoc +QMAKE_UIC = $(QTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/irix-cc-64/qmake.conf b/mkspecs/irix-cc-64/qmake.conf index 2c6069c5..0230ab38 100644 --- a/mkspecs/irix-cc-64/qmake.conf +++ b/mkspecs/irix-cc-64/qmake.conf @@ -95,8 +95,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu -lm QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $(QTDIR)/bin/moc -QMAKE_UIC = $(QTDIR)/bin/uic +QMAKE_MOC = $(QTDIR)/bin/tqmoc +QMAKE_UIC = $(QTDIR)/bin/tquic QMAKE_AR = CC -ar -o QMAKE_RANLIB = diff --git a/mkspecs/irix-cc-o32/qmake.conf b/mkspecs/irix-cc-o32/qmake.conf index 4ef43690..d7ed9fa0 100644 --- a/mkspecs/irix-cc-o32/qmake.conf +++ b/mkspecs/irix-cc-o32/qmake.conf @@ -69,8 +69,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu -lm QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $(QTDIR)/bin/moc -QMAKE_UIC = $(QTDIR)/bin/uic +QMAKE_MOC = $(QTDIR)/bin/tqmoc +QMAKE_UIC = $(QTDIR)/bin/tquic QMAKE_AR = ar cq QMAKE_RANLIB = diff --git a/mkspecs/irix-cc/qmake.conf b/mkspecs/irix-cc/qmake.conf index 7ec779df..b9a67122 100644 --- a/mkspecs/irix-cc/qmake.conf +++ b/mkspecs/irix-cc/qmake.conf @@ -95,8 +95,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu -lm QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $(QTDIR)/bin/moc -QMAKE_UIC = $(QTDIR)/bin/uic +QMAKE_MOC = $(QTDIR)/bin/tqmoc +QMAKE_UIC = $(QTDIR)/bin/tquic QMAKE_AR = CC -ar -o QMAKE_RANLIB = diff --git a/mkspecs/irix-g++/qmake.conf b/mkspecs/irix-g++/qmake.conf index cb03cbcf..ec512e94 100644 --- a/mkspecs/irix-g++/qmake.conf +++ b/mkspecs/irix-g++/qmake.conf @@ -66,8 +66,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $(QTDIR)/bin/moc -QMAKE_UIC = $(QTDIR)/bin/uic +QMAKE_MOC = $(QTDIR)/bin/tqmoc +QMAKE_UIC = $(QTDIR)/bin/tquic QMAKE_AR = ar cq QMAKE_RANLIB = diff --git a/mkspecs/linux-cxx/qmake.conf b/mkspecs/linux-cxx/qmake.conf index 9c48776e..ff4a1979 100644 --- a/mkspecs/linux-cxx/qmake.conf +++ b/mkspecs/linux-cxx/qmake.conf @@ -61,8 +61,8 @@ QMAKE_LIBS_QT = -lqt QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu -QMAKE_MOC = $(QTDIR)/bin/moc -QMAKE_UIC = $(QTDIR)/bin/uic +QMAKE_MOC = $(QTDIR)/bin/tqmoc +QMAKE_UIC = $(QTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/linux-ecc-64/qmake.conf b/mkspecs/linux-ecc-64/qmake.conf index 9fe224fb..95842ae7 100644 --- a/mkspecs/linux-ecc-64/qmake.conf +++ b/mkspecs/linux-ecc-64/qmake.conf @@ -66,8 +66,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $(QTDIR)/bin/moc -QMAKE_UIC = $(QTDIR)/bin/uic +QMAKE_MOC = $(QTDIR)/bin/tqmoc +QMAKE_UIC = $(QTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/linux-g++-32/qmake.conf b/mkspecs/linux-g++-32/qmake.conf index 89dc6b84..c41659ca 100644 --- a/mkspecs/linux-g++-32/qmake.conf +++ b/mkspecs/linux-g++-32/qmake.conf @@ -68,8 +68,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $(QTDIR)/bin/moc -QMAKE_UIC = $(QTDIR)/bin/uic +QMAKE_MOC = $(QTDIR)/bin/tqmoc +QMAKE_UIC = $(QTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/linux-g++-64/qmake.conf b/mkspecs/linux-g++-64/qmake.conf index e45a2e01..84609f9f 100644 --- a/mkspecs/linux-g++-64/qmake.conf +++ b/mkspecs/linux-g++-64/qmake.conf @@ -71,8 +71,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $(QTDIR)/bin/moc -QMAKE_UIC = $(QTDIR)/bin/uic +QMAKE_MOC = $(QTDIR)/bin/tqmoc +QMAKE_UIC = $(QTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/linux-g++-sparc/qmake.conf b/mkspecs/linux-g++-sparc/qmake.conf index f450a4db..bb7feb56 100644 --- a/mkspecs/linux-g++-sparc/qmake.conf +++ b/mkspecs/linux-g++-sparc/qmake.conf @@ -68,8 +68,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $(QTDIR)/bin/moc -QMAKE_UIC = $(QTDIR)/bin/uic +QMAKE_MOC = $(QTDIR)/bin/tqmoc +QMAKE_UIC = $(QTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/linux-g++/qmake.conf b/mkspecs/linux-g++/qmake.conf index 037bcd96..42de9ea6 100644 --- a/mkspecs/linux-g++/qmake.conf +++ b/mkspecs/linux-g++/qmake.conf @@ -68,8 +68,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $(QTDIR)/bin/moc -QMAKE_UIC = $(QTDIR)/bin/uic +QMAKE_MOC = $(QTDIR)/bin/tqmoc +QMAKE_UIC = $(QTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/linux-icc/qmake.conf b/mkspecs/linux-icc/qmake.conf index ed7b5906..acde7cd5 100644 --- a/mkspecs/linux-icc/qmake.conf +++ b/mkspecs/linux-icc/qmake.conf @@ -66,8 +66,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $(QTDIR)/bin/moc -QMAKE_UIC = $(QTDIR)/bin/uic +QMAKE_MOC = $(QTDIR)/bin/tqmoc +QMAKE_UIC = $(QTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/linux-kcc/qmake.conf b/mkspecs/linux-kcc/qmake.conf index 3798f8b3..e99e0500 100644 --- a/mkspecs/linux-kcc/qmake.conf +++ b/mkspecs/linux-kcc/qmake.conf @@ -73,8 +73,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -QMAKE_MOC = $(QTDIR)/bin/moc -QMAKE_UIC = $(QTDIR)/bin/uic +QMAKE_MOC = $(QTDIR)/bin/tqmoc +QMAKE_UIC = $(QTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/linux-kylix/qmake.conf b/mkspecs/linux-kylix/qmake.conf index 12b7ed3c..fe282d93 100644 --- a/mkspecs/linux-kylix/qmake.conf +++ b/mkspecs/linux-kylix/qmake.conf @@ -65,8 +65,8 @@ QMAKE_LIBS_OPENGL = -llibGLU -llibGL -llibXmu QMAKE_LIBS_OPENGL_QT = -llibGL -llibXmu QMAKE_LIBS_THREAD = -llibpthread -QMAKE_MOC = $(QTDIR)/bin/moc -QMAKE_UIC = $(QTDIR)/bin/uic +QMAKE_MOC = $(QTDIR)/bin/tqmoc +QMAKE_UIC = $(QTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/linux-pgcc/qmake.conf b/mkspecs/linux-pgcc/qmake.conf index c4b68eb0..e5b7bc55 100644 --- a/mkspecs/linux-pgcc/qmake.conf +++ b/mkspecs/linux-pgcc/qmake.conf @@ -66,8 +66,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $(QTDIR)/bin/moc -QMAKE_UIC = $(QTDIR)/bin/uic +QMAKE_MOC = $(QTDIR)/bin/tqmoc +QMAKE_UIC = $(QTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/lynxos-g++/qmake.conf b/mkspecs/lynxos-g++/qmake.conf index c65552b0..af0a213a 100644 --- a/mkspecs/lynxos-g++/qmake.conf +++ b/mkspecs/lynxos-g++/qmake.conf @@ -67,8 +67,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $(QTDIR)/bin/moc -QMAKE_UIC = $(QTDIR)/bin/uic +QMAKE_MOC = $(QTDIR)/bin/tqmoc +QMAKE_UIC = $(QTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/macx-g++/qmake.conf b/mkspecs/macx-g++/qmake.conf index bc8483d4..126d7b54 100644 --- a/mkspecs/macx-g++/qmake.conf +++ b/mkspecs/macx-g++/qmake.conf @@ -70,8 +70,8 @@ QMAKE_LIBS_OPENGL = -framework OpenGL -framework AGL QMAKE_LIBS_OPENGL_QT = $$QMAKE_LIBS_OPENGL QMAKE_LIBS_THREAD = -QMAKE_MOC = $(QTDIR)/bin/moc -QMAKE_UIC = $(QTDIR)/bin/uic +QMAKE_MOC = $(QTDIR)/bin/tqmoc +QMAKE_UIC = $(QTDIR)/bin/tquic QMAKE_AR = ar cq QMAKE_RANLIB = ranlib -s diff --git a/mkspecs/macx-pbuilder/qmake.conf b/mkspecs/macx-pbuilder/qmake.conf index 6a1883f4..f4cef847 100755 --- a/mkspecs/macx-pbuilder/qmake.conf +++ b/mkspecs/macx-pbuilder/qmake.conf @@ -61,8 +61,8 @@ QMAKE_LIBS_THREAD = QMAKE_LIBS_OPENGL = -framework OpenGL -framework AGL QMAKE_LIBS_OPENGL_QT = $$QMAKE_LIBS_OPENGL -QMAKE_MOC = $(QTDIR)/bin/moc -QMAKE_UIC = $(QTDIR)/bin/uic +QMAKE_MOC = $(QTDIR)/bin/tqmoc +QMAKE_UIC = $(QTDIR)/bin/tquic QMAKE_AR = ar cq QMAKE_RANLIB = ranlib -s diff --git a/mkspecs/macx-xlc/qmake.conf b/mkspecs/macx-xlc/qmake.conf index 1fabb101..ecebbebf 100644 --- a/mkspecs/macx-xlc/qmake.conf +++ b/mkspecs/macx-xlc/qmake.conf @@ -70,8 +70,8 @@ QMAKE_LIBS_OPENGL = -framework OpenGL -framework AGL QMAKE_LIBS_OPENGL_QT = $$QMAKE_LIBS_OPENGL #QMAKE_LIBS_THREAD = -lpthreads -QMAKE_MOC = $(QTDIR)/bin/moc -QMAKE_UIC = $(QTDIR)/bin/uic +QMAKE_MOC = $(QTDIR)/bin/tqmoc +QMAKE_UIC = $(QTDIR)/bin/tquic QMAKE_AR = ar cq QMAKE_RANLIB = ranlib -s diff --git a/mkspecs/netbsd-g++/qmake.conf b/mkspecs/netbsd-g++/qmake.conf index 9e062e9f..b5975dd0 100644 --- a/mkspecs/netbsd-g++/qmake.conf +++ b/mkspecs/netbsd-g++/qmake.conf @@ -64,8 +64,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -QMAKE_MOC = $(QTDIR)/bin/moc -QMAKE_UIC = $(QTDIR)/bin/uic +QMAKE_MOC = $(QTDIR)/bin/tqmoc +QMAKE_UIC = $(QTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = ranlib diff --git a/mkspecs/openbsd-g++/qmake.conf b/mkspecs/openbsd-g++/qmake.conf index 821ca461..01aa46c4 100644 --- a/mkspecs/openbsd-g++/qmake.conf +++ b/mkspecs/openbsd-g++/qmake.conf @@ -65,8 +65,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -QMAKE_MOC = $(QTDIR)/bin/moc -QMAKE_UIC = $(QTDIR)/bin/uic +QMAKE_MOC = $(QTDIR)/bin/tqmoc +QMAKE_UIC = $(QTDIR)/bin/tquic QMAKE_AR = ar q QMAKE_RANLIB = ranlib diff --git a/mkspecs/qnx-g++/qmake.conf b/mkspecs/qnx-g++/qmake.conf index 2e140efb..fba136f0 100644 --- a/mkspecs/qnx-g++/qmake.conf +++ b/mkspecs/qnx-g++/qmake.conf @@ -65,8 +65,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -QMAKE_MOC = $(QTDIR)/bin/moc -QMAKE_UIC = $(QTDIR)/bin/uic +QMAKE_MOC = $(QTDIR)/bin/tqmoc +QMAKE_UIC = $(QTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/reliant-cds-64/qmake.conf b/mkspecs/reliant-cds-64/qmake.conf index 227ce7ee..9c8f6198 100644 --- a/mkspecs/reliant-cds-64/qmake.conf +++ b/mkspecs/reliant-cds-64/qmake.conf @@ -65,8 +65,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -QMAKE_MOC = $(QTDIR)/bin/moc -QMAKE_UIC = $(QTDIR)/bin/uic +QMAKE_MOC = $(QTDIR)/bin/tqmoc +QMAKE_UIC = $(QTDIR)/bin/tquic QMAKE_AR = CC -xar -o QMAKE_RANLIB = diff --git a/mkspecs/reliant-cds/qmake.conf b/mkspecs/reliant-cds/qmake.conf index c8c670ba..cdecfd2f 100644 --- a/mkspecs/reliant-cds/qmake.conf +++ b/mkspecs/reliant-cds/qmake.conf @@ -65,8 +65,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -QMAKE_MOC = $(QTDIR)/bin/moc -QMAKE_UIC = $(QTDIR)/bin/uic +QMAKE_MOC = $(QTDIR)/bin/tqmoc +QMAKE_UIC = $(QTDIR)/bin/tquic QMAKE_AR = CC -xar -o QMAKE_RANLIB = diff --git a/mkspecs/sco-cc/qmake.conf b/mkspecs/sco-cc/qmake.conf index c605cb8f..dd1511ac 100644 --- a/mkspecs/sco-cc/qmake.conf +++ b/mkspecs/sco-cc/qmake.conf @@ -61,8 +61,8 @@ QMAKE_LIBS_QT = -lqt QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu -lXt QMAKE_LIBS_OPENGL_QT = -lGL -lXmu -QMAKE_MOC = $(QTDIR)/bin/moc -QMAKE_UIC = $(QTDIR)/bin/uic +QMAKE_MOC = $(QTDIR)/bin/tqmoc +QMAKE_UIC = $(QTDIR)/bin/tquic QMAKE_AR = ar cq QMAKE_RANLIB = diff --git a/mkspecs/sco-g++/qmake.conf b/mkspecs/sco-g++/qmake.conf index a54ad83a..7c0314c9 100644 --- a/mkspecs/sco-g++/qmake.conf +++ b/mkspecs/sco-g++/qmake.conf @@ -58,8 +58,8 @@ QMAKE_LIBS_QT = -lqt QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu -QMAKE_MOC = $(QTDIR)/bin/moc -QMAKE_UIC = $(QTDIR)/bin/uic +QMAKE_MOC = $(QTDIR)/bin/tqmoc +QMAKE_UIC = $(QTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/solaris-cc-64/qmake.conf b/mkspecs/solaris-cc-64/qmake.conf index 8fd0ad1b..205c438c 100644 --- a/mkspecs/solaris-cc-64/qmake.conf +++ b/mkspecs/solaris-cc-64/qmake.conf @@ -83,8 +83,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -lpthread -lrt -QMAKE_MOC = $(QTDIR)/bin/moc -QMAKE_UIC = $(QTDIR)/bin/uic +QMAKE_MOC = $(QTDIR)/bin/tqmoc +QMAKE_UIC = $(QTDIR)/bin/tquic QMAKE_AR = CC -xar -o QMAKE_RANLIB = diff --git a/mkspecs/solaris-cc/qmake.conf b/mkspecs/solaris-cc/qmake.conf index a4ff0d29..aea9c800 100644 --- a/mkspecs/solaris-cc/qmake.conf +++ b/mkspecs/solaris-cc/qmake.conf @@ -66,8 +66,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -lpthread -lrt -QMAKE_MOC = $(QTDIR)/bin/moc -QMAKE_UIC = $(QTDIR)/bin/uic +QMAKE_MOC = $(QTDIR)/bin/tqmoc +QMAKE_UIC = $(QTDIR)/bin/tquic QMAKE_AR = CC -xar -o QMAKE_RANLIB = diff --git a/mkspecs/solaris-g++-64/qmake.conf b/mkspecs/solaris-g++-64/qmake.conf index c6cccdab..a7f9e6ff 100644 --- a/mkspecs/solaris-g++-64/qmake.conf +++ b/mkspecs/solaris-g++-64/qmake.conf @@ -87,8 +87,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -lpthread -lrt -QMAKE_MOC = $(QTDIR)/bin/moc -QMAKE_UIC = $(QTDIR)/bin/uic +QMAKE_MOC = $(QTDIR)/bin/tqmoc +QMAKE_UIC = $(QTDIR)/bin/tquic QMAKE_AR = ar cq QMAKE_RANLIB = diff --git a/mkspecs/solaris-g++/qmake.conf b/mkspecs/solaris-g++/qmake.conf index 435156c1..d2318118 100644 --- a/mkspecs/solaris-g++/qmake.conf +++ b/mkspecs/solaris-g++/qmake.conf @@ -70,8 +70,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -lpthread -lrt -QMAKE_MOC = $(QTDIR)/bin/moc -QMAKE_UIC = $(QTDIR)/bin/uic +QMAKE_MOC = $(QTDIR)/bin/tqmoc +QMAKE_UIC = $(QTDIR)/bin/tquic QMAKE_AR = ar cq QMAKE_RANLIB = diff --git a/mkspecs/tru64-cxx/qmake.conf b/mkspecs/tru64-cxx/qmake.conf index 7feb3c79..8110aa5e 100644 --- a/mkspecs/tru64-cxx/qmake.conf +++ b/mkspecs/tru64-cxx/qmake.conf @@ -63,8 +63,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -lrt -QMAKE_MOC = $(QTDIR)/bin/moc -QMAKE_UIC = $(QTDIR)/bin/uic +QMAKE_MOC = $(QTDIR)/bin/tqmoc +QMAKE_UIC = $(QTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/tru64-g++/qmake.conf b/mkspecs/tru64-g++/qmake.conf index aae34634..64c85a5b 100644 --- a/mkspecs/tru64-g++/qmake.conf +++ b/mkspecs/tru64-g++/qmake.conf @@ -63,8 +63,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -lpthread -lexc -lrt -QMAKE_MOC = $(QTDIR)/bin/moc -QMAKE_UIC = $(QTDIR)/bin/uic +QMAKE_MOC = $(QTDIR)/bin/tqmoc +QMAKE_UIC = $(QTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/unixware-cc/qmake.conf b/mkspecs/unixware-cc/qmake.conf index 3660e416..b93b1a07 100644 --- a/mkspecs/unixware-cc/qmake.conf +++ b/mkspecs/unixware-cc/qmake.conf @@ -68,8 +68,8 @@ QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -QMAKE_MOC = $(QTDIR)/bin/moc -QMAKE_UIC = $(QTDIR)/bin/uic +QMAKE_MOC = $(QTDIR)/bin/tqmoc +QMAKE_UIC = $(QTDIR)/bin/tquic QMAKE_AR = ar cq QMAKE_RANLIB = diff --git a/mkspecs/unixware-g++/qmake.conf b/mkspecs/unixware-g++/qmake.conf index 5351493c..bf9fa588 100644 --- a/mkspecs/unixware-g++/qmake.conf +++ b/mkspecs/unixware-g++/qmake.conf @@ -65,8 +65,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu -lXt QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -lthread -QMAKE_MOC = $(QTDIR)/bin/moc -QMAKE_UIC = $(QTDIR)/bin/uic +QMAKE_MOC = $(QTDIR)/bin/tqmoc +QMAKE_UIC = $(QTDIR)/bin/tquic QMAKE_AR = ar cq QMAKE_RANLIB = diff --git a/mkspecs/win32-watcom/qmake.conf b/mkspecs/win32-watcom/qmake.conf index db5b935e..a04fb636 100644 --- a/mkspecs/win32-watcom/qmake.conf +++ b/mkspecs/win32-watcom/qmake.conf @@ -51,8 +51,8 @@ QMAKE_LIBS_QT_ENTRY = %QTDIR%\lib\qtmain.lib QMAKE_LIBS_OPENGL = opengl32.lib -QMAKE_MOC = $(QTDIR)/bin/moc.exe -QMAKE_UIC = $(QTDIR)/bin/uic.exe +QMAKE_MOC = $(QTDIR)/bin/tqmoc.exe +QMAKE_UIC = $(QTDIR)/bin/tquic.exe QMAKE_IDC = $(QTDIR)/bin/idc.exe QMAKE_LIB = wlib -b -c -n -q -p=512 diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix index f73370f9..32029e44 100644 --- a/qmake/Makefile.unix +++ b/qmake/Makefile.unix @@ -1,4 +1,4 @@ -#qmake code +#tqmake code OBJS=project.o property.o main.o makefile.o unixmake2.o unixmake.o msvc_nmake.o \ borland_bmake.o mingw_make.o msvc_dsp.o msvc_vcproj.o option.o \ winmakefile.o projectgenerator.o metrowerks_xml.o pbuilder_pbx.o \ @@ -39,14 +39,14 @@ CXXFLAGS= @QMAKE_CXXFLAGS@ \ -DQT_NO_COMPRESS -I@QMAKESPEC@ -DHAVE_QCONFIG_CPP LFLAGS=@QMAKE_LFLAGS@ -qmake: $(OBJS) $(QOBJS) +tqmake: $(OBJS) $(QOBJS) $(CXX) -o $@ $(OBJS) $(QOBJS) $(LFLAGS) rm -f @BUILD_PATH@/bin/$@ ln -s ../qmake/$@ @BUILD_PATH@/bin/$@ -install: qmake +install: tqmake [ -d @QT_INSTALL_BINS@ ] || mkdir -p @QT_INSTALL_BINS@ - -cp -f @BUILD_PATH@/bin/qmake @QT_INSTALL_BINS@ + -cp -f @BUILD_PATH@/bin/tqmake @QT_INSTALL_BINS@ [ -d @QT_INSTALL_DATA@ ] || mkdir -p @QT_INSTALL_DATA@ -cp -R -f @SOURCE_PATH@/mkspecs @QT_INSTALL_DATA@ -ln -s -f @QMAKESPEC@ @QT_INSTALL_DATA@/mkspecs/default @@ -55,7 +55,7 @@ clean:: rm -f $(OBJS) $(QOBJS) distclean:: clean - rm -rf qmake .deps + rm -rf tqmake .deps depend: makedepend $(CXXFLAGS) -D__MAKEDEPEND__ $(DEPEND_SRC) diff --git a/qmake/Makefile.win32-g++ b/qmake/Makefile.win32-g++ index aafe9ed8..b1598dfd 100644 --- a/qmake/Makefile.win32-g++ +++ b/qmake/Makefile.win32-g++ @@ -9,11 +9,11 @@ CFLAGS = -c -o$@ -O \ CXXFLAGS = $(CFLAGS) LFLAGS = LIBS = -lole32 -luuid -LINKQMAKE = g++ $(LFLAGS) -o qmake.exe $(OBJS) $(QTOBJS) $(LIBS) +LINKQMAKE = g++ $(LFLAGS) -o tqmake.exe $(OBJS) $(QTOBJS) $(LIBS) ADDCLEAN = -#qmake code +#tqmake code OBJS=project.o main.o makefile.o unixmake.o unixmake2.o borland_bmake.o mingw_make.o \ msvc_nmake.o msvc_dsp.o msvc_vcproj.o option.o winmakefile.o projectgenerator.o \ metrowerks_xml.o pbuilder_pbx.o msvc_objectmodel.o property.o meta.o qtmd5.o @@ -27,15 +27,15 @@ QTOBJS=qstring.o quuid.o qtextstream.o qiodevice.o qglobal.o qgdict.o qcstring.o -qmake.exe: $(OBJS) $(QTOBJS) +tqmake.exe: $(OBJS) $(QTOBJS) $(LINKQMAKE) - -copy qmake.exe ..\bin\qmake.exe + -copy tqmake.exe ..\bin\tqmake.exe clean:: -del $(OBJS) $(QTOBJS) $(ADDCLEAN) distclean:: clean - -del qmake + -del tqmake .c.o: $(CXX) $(CFLAGS) $< diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp index 04c8ab8e..4f094502 100644 --- a/qmake/generators/mac/pbuilder_pbx.cpp +++ b/qmake/generators/mac/pbuilder_pbx.cpp @@ -356,7 +356,7 @@ ProjectBuilderMakefileGenerator::writeMakeParts(TQTextStream &t) TQTextStream mkt(&mkf); writeHeader(mkt); mkt << "QMAKE = " << - (project->isEmpty("QMAKE_QMAKE") ? TQString("$(QTDIR)/bin/qmake") : + (project->isEmpty("QMAKE_QMAKE") ? TQString("$(QTDIR)/bin/tqmake") : var("QMAKE_QMAKE")) << endl; writeMakeQmake(mkt); mkf.close(); diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index b4348588..fae1dc6c 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -2183,7 +2183,7 @@ MakefileGenerator::writeMakeQmake(TQTextStream &t) t << project->variables()["QMAKE_INTERNAL_INCLUDED_FILES"].join(" \\\n\t\t") << "\n\t" << qmake <<endl; } - if(project->first("QMAKE_ORIG_TARGET") != "qmake") { + if(project->first("QMAKE_ORIG_TARGET") != "tqmake") { t << "qmake: " << project->variables()["QMAKE_INTERNAL_QMAKE_DEPS"].join(" \\\n\t\t") << "\n\t" << "@" << qmake << endl << endl; diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp index f4049c2c..6d72ce12 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -66,7 +66,7 @@ UnixMakefileGenerator::init() if(project->isEmpty("MAKEFILE")) project->variables()["MAKEFILE"].append("Makefile"); if(project->isEmpty("QMAKE")) - project->variables()["QMAKE"].append("qmake"); + project->variables()["QMAKE"].append("tqmake"); if(project->variables()["QMAKE_INTERNAL_QMAKE_DEPS"].findIndex("qmake_all") == -1) project->variables()["QMAKE_INTERNAL_QMAKE_DEPS"].append("qmake_all"); return; /* subdirs is done */ diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp index d988819a..684a6442 100644 --- a/qmake/generators/unix/unixmake2.cpp +++ b/qmake/generators/unix/unixmake2.cpp @@ -74,7 +74,7 @@ UnixMakefileGenerator::writeMakefile(TQTextStream &t) writeHeader(t); if(!project->variables()["QMAKE_FAILED_REQUIREMENTS"].isEmpty()) { - t << "QMAKE = " << (project->isEmpty("QMAKE_QMAKE") ? TQString("qmake") : var("QMAKE_QMAKE")) << endl; + t << "QMAKE = " << (project->isEmpty("QMAKE_QMAKE") ? TQString("tqmake") : var("QMAKE_QMAKE")) << endl; { //write the extra unix targets.. TQStringList &qut = project->variables()["QMAKE_EXTRA_UNIX_TARGETS"]; for(TQStringList::ConstIterator it = qut.begin(); it != qut.end(); ++it) @@ -181,7 +181,7 @@ UnixMakefileGenerator::writeMakeParts(TQTextStream &t) t << "RANLIB = " << var("QMAKE_RANLIB") << endl; t << "MOC = " << var("QMAKE_MOC") << endl; t << "UIC = " << var("QMAKE_UIC") << endl; - t << "QMAKE = " << (project->isEmpty("QMAKE_QMAKE") ? TQString("qmake") : var("QMAKE_QMAKE")) << endl; + t << "QMAKE = " << (project->isEmpty("QMAKE_QMAKE") ? TQString("tqmake") : var("QMAKE_QMAKE")) << endl; t << "TAR = " << var("QMAKE_TAR") << endl; t << "GZIP = " << var("QMAKE_GZIP") << endl; if(project->isActiveConfig("compile_libtool")) diff --git a/qmake/meta.cpp b/qmake/meta.cpp index 05ffec54..36ae2574 100644 --- a/qmake/meta.cpp +++ b/qmake/meta.cpp @@ -73,7 +73,7 @@ TQMakeMetaInfo::readLib(const TQString &lib) if(!proj.read(Option::fixPathToLocalOS(meta_file), TQDir::currentDirPath(), TQMakeProject::ReadProFile)) return FALSE; - meta_type = "qmake"; + meta_type = "tqmake"; vars = proj.variables(); ret = TRUE; } else { diff --git a/src/moc/moc.pro b/src/moc/moc.pro index da95b173..efa80810 100644 --- a/src/moc/moc.pro +++ b/src/moc/moc.pro @@ -1,5 +1,5 @@ TEMPLATE = app -TARGET = moc +TARGET = tqmoc CONFIG = console release qtinc yacc lex_included yacc_no_name_mangle DEFINES += QT_MOC QT_NO_CODECS QT_LITE_UNICODE QT_NO_COMPONENT \ diff --git a/tools/assistant/assistant.pro b/tools/assistant/assistant.pro index 1d8ba5cd..4575cae3 100644 --- a/tools/assistant/assistant.pro +++ b/tools/assistant/assistant.pro @@ -1,6 +1,6 @@ TEMPLATE = app LANGUAGE = C++ -TARGET = assistant +TARGET = tqassistant CONFIG += qt warn_off diff --git a/tools/designer/app/app.pro b/tools/designer/app/app.pro index 3c493e25..5d2aa406 100644 --- a/tools/designer/app/app.pro +++ b/tools/designer/app/app.pro @@ -1,5 +1,5 @@ TEMPLATE = app -TARGET = designer +TARGET = tqdesigner CONFIG -= moc DESTDIR = $$QT_BUILD_TREE/bin diff --git a/tools/designer/uic/uic.pro b/tools/designer/uic/uic.pro index ef5bde01..722dedfb 100644 --- a/tools/designer/uic/uic.pro +++ b/tools/designer/uic/uic.pro @@ -21,7 +21,7 @@ SOURCES = main.cpp uic.cpp form.cpp object.cpp \ DEFINES += QT_INTERNAL_XML include( ../../../src/qt_professional.pri ) -TARGET = uic +TARGET = tquic INCLUDEPATH += ../shared DEFINES += UIC DESTDIR = ../../../bin diff --git a/tools/linguist/linguist/linguist.pro b/tools/linguist/linguist/linguist.pro index da4d782d..5053ed98 100644 --- a/tools/linguist/linguist/linguist.pro +++ b/tools/linguist/linguist/linguist.pro @@ -32,7 +32,7 @@ DEFINES += QT_INTERNAL_XML include( ../../../src/qt_professional.pri ) DESTDIR = ../../../bin -TARGET = linguist +TARGET = tqlinguist LIBS += -L$$QT_BUILD_TREE/lib -lqassistantclient diff --git a/tools/linguist/lrelease/lrelease.pro b/tools/linguist/lrelease/lrelease.pro index 755ea46a..c34ad0df 100644 --- a/tools/linguist/lrelease/lrelease.pro +++ b/tools/linguist/lrelease/lrelease.pro @@ -9,7 +9,7 @@ SOURCES = main.cpp \ DEFINES += QT_INTERNAL_XML include( ../../../src/qt_professional.pri ) -TARGET = lrelease +TARGET = tqlrelease INCLUDEPATH += ../shared DESTDIR = ../../../bin diff --git a/tools/linguist/lupdate/lupdate.pro b/tools/linguist/lupdate/lupdate.pro index 1dad999c..9a6744fe 100644 --- a/tools/linguist/lupdate/lupdate.pro +++ b/tools/linguist/lupdate/lupdate.pro @@ -13,7 +13,7 @@ SOURCES = fetchtr.cpp \ DEFINES += QT_INTERNAL_XML include( ../../../src/qt_professional.pri ) -TARGET = lupdate +TARGET = tqlupdate INCLUDEPATH += ../shared DESTDIR = ../../../bin diff --git a/tools/qembed/qembed.pro b/tools/qembed/qembed.pro index a10bbcdb..6a35a570 100644 --- a/tools/qembed/qembed.pro +++ b/tools/qembed/qembed.pro @@ -1,6 +1,6 @@ CONFIG += console qt warn_on release SOURCES = qembed.cpp -TARGET = qembed +TARGET = tqembed REQUIRES=full-config nocrosscompiler target.path = $$bins.path diff --git a/tools/qtconfig/qtconfig.pro b/tools/qtconfig/qtconfig.pro index aaef136e..b68ec95e 100644 --- a/tools/qtconfig/qtconfig.pro +++ b/tools/qtconfig/qtconfig.pro @@ -8,7 +8,7 @@ FORMS = mainwindowbase.ui paletteeditoradvancedbase.ui previewwidgetbase.ui IMAGES = images/appicon.png PROJECTNAME = Qt Configuration -TARGET = qtconfig +TARGET = tqtconfig DESTDIR = ../../bin target.path=$$bins.path |