summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2012-02-14 21:07:37 -0600
committerTimothy Pearson <[email protected]>2012-02-14 21:07:37 -0600
commit08154cad27cbfb8b71582c28fab1b7875b783ea9 (patch)
tree907cc3e5f3615ed1059ea371d1da61e417b226e3
parent722322cf6ca62237287e234cb6db0d3d9e5a2ca2 (diff)
downloadkatapult-08154cad27cbfb8b71582c28fab1b7875b783ea9.tar.gz
katapult-08154cad27cbfb8b71582c28fab1b7875b783ea9.zip
Update various qt function definitions and static methods for tqt3
-rw-r--r--acinclude.m412
1 files changed, 6 insertions, 6 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 52716e3..9bbbd95 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1104,7 +1104,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
@@ -1201,22 +1201,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"