Add tqt3 binary rename

2 files changed, 1123 insertions, 0 deletions

diff --git a/qt3-tqt3/create_tqt3_from_qt3 b/qt3-tqt3/create_tqt3_from_qt3
index 868821e..a2986eb 100755
--- a/qt3-tqt3/create_tqt3_from_qt3
+++ b/qt3-tqt3/create_tqt3_from_qt3
@@ -8,6 +8,7 @@ patch -p0 < ../tqt3_fixups_batch2.diff
 ../convert_qt_itself_qt3_batch2
 patch -p0 < ../tqt3_fixups_batch3.diff
 ../convert_qt_itself_qt3_batch3
+patch -p0 < ../tqt3_bin_rename.diff
 
 # Regenerate moc files
 cd src/moc/
diff --git a/qt3-tqt3/tqt3_bin_rename.diff b/qt3-tqt3/tqt3_bin_rename.diff
new file mode 100644
index 0000000..b9edfd9
--- /dev/null
+++ b/qt3-tqt3/tqt3_bin_rename.diff
@@ -0,0 +1,1122 @@
+diff --git configure configure
+index 9b0d5eb..c41f6b7 100755
+--- configure
++++ configure
+@@ -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 mkspecs/aix-g++-64/qmake.conf mkspecs/aix-g++-64/qmake.conf
+index 5bd9b7c..400711e 100755
+--- mkspecs/aix-g++-64/qmake.conf
++++ 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 mkspecs/aix-g++/qmake.conf mkspecs/aix-g++/qmake.conf
+index dacf623..e65e94e 100644
+--- mkspecs/aix-g++/qmake.conf
++++ 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 mkspecs/aix-xlc-64/qmake.conf mkspecs/aix-xlc-64/qmake.conf
+index e084af2..721f8b0 100644
+--- mkspecs/aix-xlc-64/qmake.conf
++++ 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 mkspecs/aix-xlc/qmake.conf mkspecs/aix-xlc/qmake.conf
+index 7e8cb56..92782e3 100644
+--- mkspecs/aix-xlc/qmake.conf
++++ 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 mkspecs/bsdi-g++/qmake.conf mkspecs/bsdi-g++/qmake.conf
+index d4e647a..7088c8e 100644
+--- mkspecs/bsdi-g++/qmake.conf
++++ 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 mkspecs/cygwin-g++/qmake.conf mkspecs/cygwin-g++/qmake.conf
+index 04c5aa5..843b352 100644
+--- mkspecs/cygwin-g++/qmake.conf
++++ 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 mkspecs/darwin-g++/qmake.conf mkspecs/darwin-g++/qmake.conf
+index 324c7f5..14afcba 100644
+--- mkspecs/darwin-g++/qmake.conf
++++ 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 mkspecs/dgux-g++/qmake.conf mkspecs/dgux-g++/qmake.conf
+index 769e6cd..1832a22 100644
+--- mkspecs/dgux-g++/qmake.conf
++++ 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 mkspecs/freebsd-g++/qmake.conf mkspecs/freebsd-g++/qmake.conf
+index 0f87845..60ca7e3 100644
+--- mkspecs/freebsd-g++/qmake.conf
++++ 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 mkspecs/freebsd-g++34/qmake.conf mkspecs/freebsd-g++34/qmake.conf
+index 59d89b5..29096ff 100644
+--- mkspecs/freebsd-g++34/qmake.conf
++++ 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 mkspecs/freebsd-icc/qmake.conf mkspecs/freebsd-icc/qmake.conf
+index 8066741..34d95b4 100644
+--- mkspecs/freebsd-icc/qmake.conf
++++ 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 mkspecs/hpux-acc-64/qmake.conf mkspecs/hpux-acc-64/qmake.conf
+index 8c325ca..5ceb160 100644
+--- mkspecs/hpux-acc-64/qmake.conf
++++ 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 mkspecs/hpux-acc-o64/qmake.conf mkspecs/hpux-acc-o64/qmake.conf
+index 45fde3c..d3bda52 100644
+--- mkspecs/hpux-acc-o64/qmake.conf
++++ 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 mkspecs/hpux-acc/qmake.conf mkspecs/hpux-acc/qmake.conf
+index 5273843..9d66d87 100644
+--- mkspecs/hpux-acc/qmake.conf
++++ 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 mkspecs/hpux-cc/qmake.conf mkspecs/hpux-cc/qmake.conf
+index fc2e8b4..732b09c 100644
+--- mkspecs/hpux-cc/qmake.conf
++++ 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 mkspecs/hpux-g++-64/qmake.conf mkspecs/hpux-g++-64/qmake.conf
+index f2a9884..2333f94 100644
+--- mkspecs/hpux-g++-64/qmake.conf
++++ 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 mkspecs/hpux-g++/qmake.conf mkspecs/hpux-g++/qmake.conf
+index fc05c57..5129404 100644
+--- mkspecs/hpux-g++/qmake.conf
++++ 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 mkspecs/hpuxi-acc-32/qmake.conf mkspecs/hpuxi-acc-32/qmake.conf
+index 3f52866..4d150b0 100644
+--- mkspecs/hpuxi-acc-32/qmake.conf
++++ 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 mkspecs/hpuxi-acc-64/qmake.conf mkspecs/hpuxi-acc-64/qmake.conf
+index 9b17fe5..5c05e66 100644
+--- mkspecs/hpuxi-acc-64/qmake.conf
++++ 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 mkspecs/hurd-g++/qmake.conf mkspecs/hurd-g++/qmake.conf
+index 9502b96..9bfddc2 100644
+--- mkspecs/hurd-g++/qmake.conf
++++ 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 mkspecs/irix-cc-64/qmake.conf mkspecs/irix-cc-64/qmake.conf
+index 2c6069c..0230ab3 100644
+--- mkspecs/irix-cc-64/qmake.conf
++++ 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 mkspecs/irix-cc-o32/qmake.conf mkspecs/irix-cc-o32/qmake.conf
+index 4ef4369..d7ed9fa 100644
+--- mkspecs/irix-cc-o32/qmake.conf
++++ 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 mkspecs/irix-cc/qmake.conf mkspecs/irix-cc/qmake.conf
+index 7ec779d..b9a6712 100644
+--- mkspecs/irix-cc/qmake.conf
++++ 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 mkspecs/irix-g++/qmake.conf mkspecs/irix-g++/qmake.conf
+index cb03cbc..ec512e9 100644
+--- mkspecs/irix-g++/qmake.conf
++++ 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 mkspecs/linux-cxx/qmake.conf mkspecs/linux-cxx/qmake.conf
+index 9c48776..ff4a197 100644
+--- mkspecs/linux-cxx/qmake.conf
++++ 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 mkspecs/linux-ecc-64/qmake.conf mkspecs/linux-ecc-64/qmake.conf
+index 9fe224f..95842ae 100644
+--- mkspecs/linux-ecc-64/qmake.conf
++++ 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 mkspecs/linux-g++-32/qmake.conf mkspecs/linux-g++-32/qmake.conf
+index 89dc6b8..c41659c 100644
+--- mkspecs/linux-g++-32/qmake.conf
++++ 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 mkspecs/linux-g++-64/qmake.conf mkspecs/linux-g++-64/qmake.conf
+index e45a2e0..84609f9 100644
+--- mkspecs/linux-g++-64/qmake.conf
++++ 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 mkspecs/linux-g++-sparc/qmake.conf mkspecs/linux-g++-sparc/qmake.conf
+index f450a4d..bb7feb5 100644
+--- mkspecs/linux-g++-sparc/qmake.conf
++++ 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 mkspecs/linux-g++/qmake.conf mkspecs/linux-g++/qmake.conf
+index 037bcd9..42de9ea 100644
+--- mkspecs/linux-g++/qmake.conf
++++ 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 mkspecs/linux-icc/qmake.conf mkspecs/linux-icc/qmake.conf
+index ed7b590..acde7cd 100644
+--- mkspecs/linux-icc/qmake.conf
++++ 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 mkspecs/linux-kcc/qmake.conf mkspecs/linux-kcc/qmake.conf
+index 3798f8b..e99e050 100644
+--- mkspecs/linux-kcc/qmake.conf
++++ 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 mkspecs/linux-kylix/qmake.conf mkspecs/linux-kylix/qmake.conf
+index 12b7ed3..fe282d9 100644
+--- mkspecs/linux-kylix/qmake.conf
++++ 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 mkspecs/linux-pgcc/qmake.conf mkspecs/linux-pgcc/qmake.conf
+index c4b68eb..e5b7bc5 100644
+--- mkspecs/linux-pgcc/qmake.conf
++++ 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 mkspecs/lynxos-g++/qmake.conf mkspecs/lynxos-g++/qmake.conf
+index c65552b..af0a213 100644
+--- mkspecs/lynxos-g++/qmake.conf
++++ 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 mkspecs/macx-g++/qmake.conf mkspecs/macx-g++/qmake.conf
+index bc8483d..126d7b5 100644
+--- mkspecs/macx-g++/qmake.conf
++++ 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 mkspecs/macx-pbuilder/qmake.conf mkspecs/macx-pbuilder/qmake.conf
+index 6a1883f..f4cef84 100755
+--- mkspecs/macx-pbuilder/qmake.conf
++++ 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 mkspecs/macx-xlc/qmake.conf mkspecs/macx-xlc/qmake.conf
+index 1fabb10..ecebbeb 100644
+--- mkspecs/macx-xlc/qmake.conf
++++ 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 mkspecs/netbsd-g++/qmake.conf mkspecs/netbsd-g++/qmake.conf
+index 9e062e9..b5975dd 100644
+--- mkspecs/netbsd-g++/qmake.conf
++++ 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 mkspecs/openbsd-g++/qmake.conf mkspecs/openbsd-g++/qmake.conf
+index 821ca46..01aa46c 100644
+--- mkspecs/openbsd-g++/qmake.conf
++++ 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 mkspecs/qnx-g++/qmake.conf mkspecs/qnx-g++/qmake.conf
+index 2e140ef..fba136f 100644
+--- mkspecs/qnx-g++/qmake.conf
++++ 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 mkspecs/reliant-cds-64/qmake.conf mkspecs/reliant-cds-64/qmake.conf
+index 227ce7e..9c8f619 100644
+--- mkspecs/reliant-cds-64/qmake.conf
++++ 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 mkspecs/reliant-cds/qmake.conf mkspecs/reliant-cds/qmake.conf
+index c8c670b..cdecfd2 100644
+--- mkspecs/reliant-cds/qmake.conf
++++ 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 mkspecs/sco-cc/qmake.conf mkspecs/sco-cc/qmake.conf
+index c605cb8..dd1511a 100644
+--- mkspecs/sco-cc/qmake.conf
++++ 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 mkspecs/sco-g++/qmake.conf mkspecs/sco-g++/qmake.conf
+index a54ad83..7c0314c 100644
+--- mkspecs/sco-g++/qmake.conf
++++ 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 mkspecs/solaris-cc-64/qmake.conf mkspecs/solaris-cc-64/qmake.conf
+index 8fd0ad1..205c438 100644
+--- mkspecs/solaris-cc-64/qmake.conf
++++ 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 mkspecs/solaris-cc/qmake.conf mkspecs/solaris-cc/qmake.conf
+index a4ff0d2..aea9c80 100644
+--- mkspecs/solaris-cc/qmake.conf
++++ 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 mkspecs/solaris-g++-64/qmake.conf mkspecs/solaris-g++-64/qmake.conf
+index c6cccda..a7f9e6f 100644
+--- mkspecs/solaris-g++-64/qmake.conf
++++ 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 mkspecs/solaris-g++/qmake.conf mkspecs/solaris-g++/qmake.conf
+index 435156c..d231811 100644
+--- mkspecs/solaris-g++/qmake.conf
++++ 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 mkspecs/tru64-cxx/qmake.conf mkspecs/tru64-cxx/qmake.conf
+index 7feb3c7..8110aa5 100644
+--- mkspecs/tru64-cxx/qmake.conf
++++ 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 mkspecs/tru64-g++/qmake.conf mkspecs/tru64-g++/qmake.conf
+index aae3463..64c85a5 100644
+--- mkspecs/tru64-g++/qmake.conf
++++ 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 mkspecs/unixware-cc/qmake.conf mkspecs/unixware-cc/qmake.conf
+index 3660e41..b93b1a0 100644
+--- mkspecs/unixware-cc/qmake.conf
++++ 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 mkspecs/unixware-g++/qmake.conf mkspecs/unixware-g++/qmake.conf
+index 5351493..bf9fa58 100644
+--- mkspecs/unixware-g++/qmake.conf
++++ 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 mkspecs/win32-watcom/qmake.conf mkspecs/win32-watcom/qmake.conf
+index db5b935..a04fb63 100644
+--- mkspecs/win32-watcom/qmake.conf
++++ 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 qmake/Makefile.unix qmake/Makefile.unix
+index f73370f..32029e4 100644
+--- qmake/Makefile.unix
++++ 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 qmake/Makefile.win32-g++ qmake/Makefile.win32-g++
+index aafe9ed..b1598df 100644
+--- qmake/Makefile.win32-g++
++++ 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 qmake/generators/mac/pbuilder_pbx.cpp qmake/generators/mac/pbuilder_pbx.cpp
+index 04c8ab8..4f09450 100644
+--- qmake/generators/mac/pbuilder_pbx.cpp
++++ 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 qmake/generators/makefile.cpp qmake/generators/makefile.cpp
+index b434858..fae1dc6 100644
+--- qmake/generators/makefile.cpp
++++ 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 qmake/generators/unix/unixmake.cpp qmake/generators/unix/unixmake.cpp
+index f4049c2..6d72ce1 100644
+--- qmake/generators/unix/unixmake.cpp
++++ 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 qmake/generators/unix/unixmake2.cpp qmake/generators/unix/unixmake2.cpp
+index d988819..684a644 100644
+--- qmake/generators/unix/unixmake2.cpp
++++ 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 qmake/meta.cpp qmake/meta.cpp
+index 05ffec5..36ae257 100644
+--- qmake/meta.cpp
++++ 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 src/moc/moc.pro src/moc/moc.pro
+index da95b17..efa8081 100644
+--- src/moc/moc.pro
++++ 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 tools/assistant/assistant.pro tools/assistant/assistant.pro
+index 1d8ba5c..4575cae 100644
+--- tools/assistant/assistant.pro
++++ tools/assistant/assistant.pro
+@@ -1,6 +1,6 @@
+ TEMPLATE = app
+ LANGUAGE = C++
+-TARGET	 = assistant
++TARGET	 = tqassistant
+ 
+ CONFIG	+= qt warn_off
+ 
+diff --git tools/designer/app/app.pro tools/designer/app/app.pro
+index 3c493e2..5d2aa40 100644
+--- tools/designer/app/app.pro
++++ tools/designer/app/app.pro
+@@ -1,5 +1,5 @@
+ TEMPLATE 	= app
+-TARGET		= designer
++TARGET		= tqdesigner
+ 
+ CONFIG 		-= moc
+ DESTDIR		= $$QT_BUILD_TREE/bin
+diff --git tools/designer/uic/uic.pro tools/designer/uic/uic.pro
+index ef5bde0..722dedf 100644
+--- tools/designer/uic/uic.pro
++++ 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 tools/linguist/linguist/linguist.pro tools/linguist/linguist/linguist.pro
+index da4d782..5053ed9 100644
+--- tools/linguist/linguist/linguist.pro
++++ 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 tools/linguist/lrelease/lrelease.pro tools/linguist/lrelease/lrelease.pro
+index 755ea46..c34ad0d 100644
+--- tools/linguist/lrelease/lrelease.pro
++++ 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 tools/linguist/lupdate/lupdate.pro tools/linguist/lupdate/lupdate.pro
+index 1dad999..9a6744f 100644
+--- tools/linguist/lupdate/lupdate.pro
++++ 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 tools/qembed/qembed.pro tools/qembed/qembed.pro
+index a10bbcd..6a35a57 100644
+--- tools/qembed/qembed.pro
++++ 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 tools/qtconfig/qtconfig.pro tools/qtconfig/qtconfig.pro
+index aaef136..b68ec95 100644
+--- tools/qtconfig/qtconfig.pro
++++ 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