diff options
| author | Timothy Pearson <[email protected]> | 2012-02-14 21:08:59 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2012-02-14 21:08:59 -0600 |
| commit | c58e9bd7eddd0edf7ef02dc86bb797682901b2a1 (patch) | |
| tree | bc2e8a29ce458184d7494fee5f31609690ebf5a8 | |
| parent | 7fb571f919e1d9cde6c924d6a4b124dc3503798e (diff) | |
| download | knowit-c58e9bd7eddd0edf7ef02dc86bb797682901b2a1.tar.gz knowit-c58e9bd7eddd0edf7ef02dc86bb797682901b2a1.zip | |
Update various qt function definitions and static methods for tqt3
| -rw-r--r-- | acinclude.m4 | 12 | ||||
| -rw-r--r-- | aclocal.m4 | 12 |
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" @@ -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" |