diff options
| author | Timothy Pearson <[email protected]> | 2012-02-14 21:11:21 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2012-02-14 21:11:21 -0600 |
| commit | f3c8306949b2c5cece09d920309f23facf6d7022 (patch) | |
| tree | 4b994e59a97932f4cb1426b7957f93cc53b8f22a | |
| parent | 78e1befdc0d79697cee792e82ca1d20470ca9982 (diff) | |
| download | kvirc-f3c8306949b2c5cece09d920309f23facf6d7022.tar.gz kvirc-f3c8306949b2c5cece09d920309f23facf6d7022.zip | |
Update various qt function definitions and static methods for tqt3
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | acinclude.m4 | 2 | ||||
| -rw-r--r-- | admin/acinclude.m4.in | 2 | ||||
| -rw-r--r-- | doc/hackers.guide.txt | 2 |
4 files changed, 4 insertions, 4 deletions
@@ -154,7 +154,7 @@ to find the Qt 3.x moc instead of the correct one. Use the --with-qt4-moc option to force the right moc compiler path. In Qt 4.x mode the COMPILE_USE_QT4 preprocessor variable is set: use it for conditionals... - an #ifdef COMPILE_USE_QT4 is more or less equivalent to #if QT_VERSION >= 0x040000. + an #ifdef COMPILE_USE_QT4 is more or less equivalent to #if TQT_VERSION >= 0x040000. We will need to "abstract" several collection classes to make everything work with both Qt 3.x and Qt 4.x. The goal is (or better would be) to hide everything in kvilib in order to have almost no conditional compilation in the kvirc core and in the modules. diff --git a/acinclude.m4 b/acinclude.m4 index 87714a86..345906f1 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2049,7 +2049,7 @@ AC_DEFUN([AC_SS_ENSURE_CAN_COMPILE_X_AND_QT4], LDFLAGS="-s $LDFLAGS" AC_TRY_LINK([ #include <qglobal.h> - #if (QT_VERSION < 0x040000) + #if (TQT_VERSION < 0x040000) #error "Bad qt version: too old" #endif ],[return 0; ],SS_QTX_LINKED_OK="TRUE",SS_QTX_LINKED_OK="FALSE") diff --git a/admin/acinclude.m4.in b/admin/acinclude.m4.in index 375b5e8e..f93e354c 100644 --- a/admin/acinclude.m4.in +++ b/admin/acinclude.m4.in @@ -2076,7 +2076,7 @@ AC_DEFUN([AC_SS_ENSURE_CAN_COMPILE_X_AND_QT4], LDFLAGS="-s $LDFLAGS" AC_TRY_LINK([ #include <qglobal.h> - #if (QT_VERSION < 0x040000) + #if (TQT_VERSION < 0x040000) #error "Bad qt version: too old" #endif ],[return 0; ],SS_QTX_LINKED_OK="TRUE",SS_QTX_LINKED_OK="FALSE") diff --git a/doc/hackers.guide.txt b/doc/hackers.guide.txt index 5eddcc8c..9143be12 100644 --- a/doc/hackers.guide.txt +++ b/doc/hackers.guide.txt @@ -886,7 +886,7 @@ For the moment, in random order: #ifdef COMPILE_USE_QT4 to check if the compilation requires Qt 4.x or Qt 3.x. Later this *might* be automatically replaced with - #if QT_VERSION >= 0x040000 + #if TQT_VERSION >= 0x040000 - Use: ./configure --enable-debug --enable-qt4 --with-qt4-moc=/path/moc |