summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarrell Anderson <[email protected]>2012-09-29 01:41:57 -0500
committerDarrell Anderson <[email protected]>2012-09-29 01:41:57 -0500
commit06e01077e1826d986821404d87de10399a7c1b6e (patch)
tree1608b116d2f63c06f30670ea1b4b6617562f989c
parent9ea2e3d89314dd9a8494e33c4d435184aedce711 (diff)
parent5feb80c8b48a0593d5c08903729ff40ec55dc4f3 (diff)
downloadtqt3-06e01077e1826d986821404d87de10399a7c1b6e.tar.gz
tqt3-06e01077e1826d986821404d87de10399a7c1b6e.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3
-rwxr-xr-xconfig.tests/unix/endian.test2
-rwxr-xr-xconfig.tests/unix/ipv6.test2
-rwxr-xr-xconfig.tests/unix/largefile.test2
-rwxr-xr-xconfig.tests/unix/ptrsize.test2
-rwxr-xr-xconfig.tests/unix/stl.test2
-rwxr-xr-xconfig.tests/x11/notype.test2
6 files changed, 6 insertions, 6 deletions
diff --git a/config.tests/unix/endian.test b/config.tests/unix/endian.test
index 9f5c5661d..2a4e39f30 100755
--- a/config.tests/unix/endian.test
+++ b/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 a/config.tests/unix/ipv6.test b/config.tests/unix/ipv6.test
index 5df87d696..9832f5a1f 100755
--- a/config.tests/unix/ipv6.test
+++ b/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 a/config.tests/unix/largefile.test b/config.tests/unix/largefile.test
index f8cde7314..94dcc84fc 100755
--- a/config.tests/unix/largefile.test
+++ b/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 a/config.tests/unix/ptrsize.test b/config.tests/unix/ptrsize.test
index 0d0337d30..cf31bd84d 100755
--- a/config.tests/unix/ptrsize.test
+++ b/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 a/config.tests/unix/stl.test b/config.tests/unix/stl.test
index 90c192538..f9669e4aa 100755
--- a/config.tests/unix/stl.test
+++ b/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 a/config.tests/x11/notype.test b/config.tests/x11/notype.test
index 4c429be1c..49743dfe5 100755
--- a/config.tests/x11/notype.test
+++ b/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