summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2012-02-14 21:10:50 -0600
committerTimothy Pearson <[email protected]>2012-02-14 21:10:50 -0600
commitf6fc9bbeeb86ea7b5855dff0c256b682ffeaff7f (patch)
treed102005f51ff0328ea08067ae73c1ff1f5a762b8
parent887c001950687221d16e0699cf7d757559ddc508 (diff)
downloadksystemlog-f6fc9bbeeb86ea7b5855dff0c256b682ffeaff7f.tar.gz
ksystemlog-f6fc9bbeeb86ea7b5855dff0c256b682ffeaff7f.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 9a6e5f0..326ca2a 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1077,7 +1077,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
@@ -1170,22 +1170,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"
+ kde_qt_verstring="TQT_VERSION >= 0x03@VER@00"
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"
+ kde_qt_verstring="TQT_VERSION >= 300"
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 ceb9e60..4c7c266 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1089,7 +1089,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
@@ -1182,22 +1182,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"
+ kde_qt_verstring="TQT_VERSION >= 0x03@VER@00"
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"
+ kde_qt_verstring="TQT_VERSION >= 300"
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"