summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-09-29 01:27:18 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-09-29 01:27:18 -0500
commit467f30f25e3479ad1be41e786c871c11d4da182f (patch)
treeb9b6349545ef03ea5fb6a57b0918fb7fb80bf468
parentbe11de5d33ae567f2aaa64c4ce1cb350cd91ad59 (diff)
downloadexperimental-467f30f25e3479ad1be41e786c871c11d4da182f.tar.gz
experimental-467f30f25e3479ad1be41e786c871c11d4da182f.zip
Fix TQt3 compile time checks
-rwxr-xr-xqt3-tqt3/create_tqt3_from_qt31
-rw-r--r--qt3-tqt3/tqt3_fixups_batch4.diff72
2 files changed, 73 insertions, 0 deletions
diff --git a/qt3-tqt3/create_tqt3_from_qt3 b/qt3-tqt3/create_tqt3_from_qt3
index a2986eb..fc9232a 100755
--- a/qt3-tqt3/create_tqt3_from_qt3
+++ b/qt3-tqt3/create_tqt3_from_qt3
@@ -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/
diff --git a/qt3-tqt3/tqt3_fixups_batch4.diff b/qt3-tqt3/tqt3_fixups_batch4.diff
new file mode 100644
index 0000000..a6167ee
--- /dev/null
+++ b/qt3-tqt3/tqt3_fixups_batch4.diff
@@ -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