Fix TQt3 compile time checks

pull/1/head
Timothy Pearson 12 years ago
parent be11de5d33
commit 467f30f25e

@ -9,6 +9,7 @@ patch -p0 < ../tqt3_fixups_batch2.diff
patch -p0 < ../tqt3_fixups_batch3.diff
../convert_qt_itself_qt3_batch3
patch -p0 < ../tqt3_bin_rename.diff
patch -p0 < ../tqt3_fixups_batch4.diff
# Regenerate moc files
cd src/moc/

@ -0,0 +1,72 @@
diff --git config.tests/unix/endian.test config.tests/unix/endian.test
--- config.tests/unix/endian.test
+++ config.tests/unix/endian.test
@@ -10,7 +10,7 @@ OUTDIR=$4
# build and run a test program
test -d $OUTDIR/config.tests/unix/endian || mkdir -p $OUTDIR/config.tests/unix/endian
-$OUTDIR/bin/qmake -nocache -spec "$QMKSPEC" $SRCDIR/config.tests/unix/endian/endiantest.pro -o $OUTDIR/config.tests/unix/endian/Makefile >/dev/null 2>&1
+$OUTDIR/bin/tqmake -nocache -spec "$QMKSPEC" $SRCDIR/config.tests/unix/endian/endiantest.pro -o $OUTDIR/config.tests/unix/endian/Makefile >/dev/null 2>&1
cd $OUTDIR/config.tests/unix/endian
if [ "$VERBOSE" = "yes" ]; then
diff --git config.tests/unix/ipv6.test config.tests/unix/ipv6.test
--- config.tests/unix/ipv6.test
+++ config.tests/unix/ipv6.test
@@ -11,7 +11,7 @@ OUTDIR=$4
# build a test program
test -d $OUTDIR/config.tests/unix/ipv6 || mkdir -p $OUTDIR/config.tests/unix/ipv6
-$OUTDIR/bin/qmake -nocache -spec "$QMKSPEC" $SRCDIR/config.tests/unix/ipv6/ipv6test.pro -o $OUTDIR/config.tests/unix/ipv6/Makefile >/dev/null 2>&1
+$OUTDIR/bin/tqmake -nocache -spec "$QMKSPEC" $SRCDIR/config.tests/unix/ipv6/ipv6test.pro -o $OUTDIR/config.tests/unix/ipv6/Makefile >/dev/null 2>&1
cd $OUTDIR/config.tests/unix/ipv6
if [ "$VERBOSE" = "yes" ]; then
diff --git config.tests/unix/largefile.test config.tests/unix/largefile.test
--- config.tests/unix/largefile.test
+++ config.tests/unix/largefile.test
@@ -11,7 +11,7 @@ OUTDIR=$4
# build and run a test program
test -d $OUTDIR/config.tests/unix/largefile || mkdir -p $OUTDIR/config.tests/unix/largefile
-$OUTDIR/bin/qmake -nocache -spec "$QMKSPEC" $SRCDIR/config.tests/unix/largefile/largefiletest.pro -o $OUTDIR/config.tests/unix/largefile/Makefile >/dev/null 2>&1
+$OUTDIR/bin/tqmake -nocache -spec "$QMKSPEC" $SRCDIR/config.tests/unix/largefile/largefiletest.pro -o $OUTDIR/config.tests/unix/largefile/Makefile >/dev/null 2>&1
cd $OUTDIR/config.tests/unix/largefile
if [ "$VERBOSE" = "yes" ]; then
diff --git config.tests/unix/ptrsize.test config.tests/unix/ptrsize.test
--- config.tests/unix/ptrsize.test
+++ config.tests/unix/ptrsize.test
@@ -11,7 +11,7 @@ OUTDIR=$4
# build and run a test program
test -d $OUTDIR/config.tests/unix/ptrsize || mkdir -p $OUTDIR/config.tests/unix/ptrsize
-$OUTDIR/bin/qmake -nocache -spec "$QMKSPEC" $SRCDIR/config.tests/unix/ptrsize/ptrsizetest.pro -o $OUTDIR/config.tests/unix/ptrsize/Makefile >/dev/null 2>&1
+$OUTDIR/bin/tqmake -nocache -spec "$QMKSPEC" $SRCDIR/config.tests/unix/ptrsize/ptrsizetest.pro -o $OUTDIR/config.tests/unix/ptrsize/Makefile >/dev/null 2>&1
cd $OUTDIR/config.tests/unix/ptrsize
if [ "$VERBOSE" = "yes" ]; then
diff --git config.tests/unix/stl.test config.tests/unix/stl.test
--- config.tests/unix/stl.test
+++ config.tests/unix/stl.test
@@ -11,7 +11,7 @@ OUTDIR=$4
# build a test program
test -d $OUTDIR/config.tests/unix/stl || mkdir -p $OUTDIR/config.tests/unix/stl
-$OUTDIR/bin/qmake -nocache -spec "$QMKSPEC" $SRCDIR/config.tests/unix/stl/stltest.pro -o $OUTDIR/config.tests/unix/stl/Makefile >/dev/null 2>&1
+$OUTDIR/bin/tqmake -nocache -spec "$QMKSPEC" $SRCDIR/config.tests/unix/stl/stltest.pro -o $OUTDIR/config.tests/unix/stl/Makefile >/dev/null 2>&1
cd $OUTDIR/config.tests/unix/stl
if [ "$VERBOSE" = "yes" ]; then
diff --git config.tests/x11/notype.test config.tests/x11/notype.test
--- config.tests/x11/notype.test
+++ config.tests/x11/notype.test
@@ -27,7 +27,7 @@ if [ $XPLATFORM = "solaris-g++" -o $XPLATFORM = "hpux-g++" -o $XPLATFORM = "aix-
NOTYPE=yes
test -d $OUTDIR/config.tests/x11/notype || mkdir -p $OUTDIR/config.tests/x11/notype
- $OUTDIR/bin/qmake -nocache -spec "$QMKSPEC" $SRCDIR/config.tests/x11/notype/notypetest.pro -o $OUTDIR/config.tests/x11/notype/Makefile >/dev/null 2>&1
+ $OUTDIR/bin/tqmake -nocache -spec "$QMKSPEC" $SRCDIR/config.tests/x11/notype/notypetest.pro -o $OUTDIR/config.tests/x11/notype/Makefile >/dev/null 2>&1
cd $OUTDIR/config.tests/x11/notype
if [ "$VERBOSE" = "yes" ]; then
Loading…
Cancel
Save