summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2012-02-14 21:10:55 -0600
committerTimothy Pearson <[email protected]>2012-02-14 21:10:55 -0600
commit37086fed358c2a38c6e9ce5bda2ecf3a86e06662 (patch)
treeca00cf270a70f4276825feed86839f70d0a65c08
parentfab7cbee7310e2967fa1de371a9cfb126411b90e (diff)
downloadktechlab-37086fed358c2a38c6e9ce5bda2ecf3a86e06662.tar.gz
ktechlab-37086fed358c2a38c6e9ce5bda2ecf3a86e06662.zip
Update various qt function definitions and static methods for tqt3
-rw-r--r--acinclude.m412
-rw-r--r--aclocal.m412
2 files changed, 12 insertions, 12 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 348e558..2181355 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1107,7 +1107,7 @@ EOF
if test $kde_qtsubver -gt 0; then
cat >> conftest.$ac_ext <<EOF
-#if QT_VERSION < 210
+#if TQT_VERSION < 210
#error 1
#endif
EOF
@@ -1204,22 +1204,22 @@ fi
if test -z "$3"; then
if test $kde_qtver = 3; then
if test $kde_qtsubver -gt 0; then
- kde_qt_verstring="QT_VERSION >= 0x03@VER@00 && QT_VERSION < 0x040000"
+ kde_qt_verstring="TQT_VERSION >= 0x03@VER@00 && TQT_VERSION < 0x040000"
qtsubver=`echo "00$kde_qtsubver" | sed -e 's,.*\(..\)$,\1,'`
kde_qt_verstring=`echo $kde_qt_verstring | sed -e "s,@VER@,$qtsubver,"`
else
- kde_qt_verstring="QT_VERSION >= 300 && QT_VERSION < 0x040000"
+ kde_qt_verstring="TQT_VERSION >= 300 && TQT_VERSION < 0x040000"
fi
fi
if test $kde_qtver = 2; then
if test $kde_qtsubver -gt 0; then
- kde_qt_verstring="QT_VERSION >= 222"
+ kde_qt_verstring="TQT_VERSION >= 222"
else
- kde_qt_verstring="QT_VERSION >= 200"
+ kde_qt_verstring="TQT_VERSION >= 200"
fi
fi
if test $kde_qtver = 1; then
- kde_qt_verstring="QT_VERSION >= 142 && QT_VERSION < 200"
+ kde_qt_verstring="TQT_VERSION >= 142 && TQT_VERSION < 200"
fi
else
kde_qt_verstring="$3"
diff --git a/aclocal.m4 b/aclocal.m4
index 54dcb9e..6091f76 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1119,7 +1119,7 @@ EOF
if test $kde_qtsubver -gt 0; then
cat >> conftest.$ac_ext <<EOF
-#if QT_VERSION < 210
+#if TQT_VERSION < 210
#error 1
#endif
EOF
@@ -1216,22 +1216,22 @@ fi
if test -z "$3"; then
if test $kde_qtver = 3; then
if test $kde_qtsubver -gt 0; then
- kde_qt_verstring="QT_VERSION >= 0x03@VER@00 && QT_VERSION < 0x040000"
+ kde_qt_verstring="TQT_VERSION >= 0x03@VER@00 && TQT_VERSION < 0x040000"
qtsubver=`echo "00$kde_qtsubver" | sed -e 's,.*\(..\)$,\1,'`
kde_qt_verstring=`echo $kde_qt_verstring | sed -e "s,@VER@,$qtsubver,"`
else
- kde_qt_verstring="QT_VERSION >= 300 && QT_VERSION < 0x040000"
+ kde_qt_verstring="TQT_VERSION >= 300 && TQT_VERSION < 0x040000"
fi
fi
if test $kde_qtver = 2; then
if test $kde_qtsubver -gt 0; then
- kde_qt_verstring="QT_VERSION >= 222"
+ kde_qt_verstring="TQT_VERSION >= 222"
else
- kde_qt_verstring="QT_VERSION >= 200"
+ kde_qt_verstring="TQT_VERSION >= 200"
fi
fi
if test $kde_qtver = 1; then
- kde_qt_verstring="QT_VERSION >= 142 && QT_VERSION < 200"
+ kde_qt_verstring="TQT_VERSION >= 142 && TQT_VERSION < 200"
fi
else
kde_qt_verstring="$3"