Automated update from Qt3

pull/1/head
Timothy Pearson 12 years ago
parent 6dec101d43
commit 1ecf57d6cf

14
configure vendored

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -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();

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

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

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

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

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

@ -1,6 +1,6 @@
TEMPLATE = app
LANGUAGE = C++
TARGET = assistant
TARGET = tqassistant
CONFIG += qt warn_off

@ -1,5 +1,5 @@
TEMPLATE = app
TARGET = designer
TARGET = tqdesigner
CONFIG -= moc
DESTDIR = $$QT_BUILD_TREE/bin

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

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

@ -9,7 +9,7 @@ SOURCES = main.cpp \
DEFINES += QT_INTERNAL_XML
include( ../../../src/qt_professional.pri )
TARGET = lrelease
TARGET = tqlrelease
INCLUDEPATH += ../shared
DESTDIR = ../../../bin

@ -13,7 +13,7 @@ SOURCES = fetchtr.cpp \
DEFINES += QT_INTERNAL_XML
include( ../../../src/qt_professional.pri )
TARGET = lupdate
TARGET = tqlupdate
INCLUDEPATH += ../shared
DESTDIR = ../../../bin

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

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

Loading…
Cancel
Save