Update various qt function definitions and static methods for tqt3

pull/1/head
Timothy Pearson 13 years ago
parent 78e1befdc0
commit f3c8306949

@ -154,7 +154,7 @@
to find the Qt 3.x moc instead of the correct one. Use the --with-qt4-moc option 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. to force the right moc compiler path.
In Qt 4.x mode the COMPILE_USE_QT4 preprocessor variable is set: use it for conditionals... 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 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 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. kvilib in order to have almost no conditional compilation in the kvirc core and in the modules.

@ -2049,7 +2049,7 @@ AC_DEFUN([AC_SS_ENSURE_CAN_COMPILE_X_AND_QT4],
LDFLAGS="-s $LDFLAGS" LDFLAGS="-s $LDFLAGS"
AC_TRY_LINK([ AC_TRY_LINK([
#include <qglobal.h> #include <qglobal.h>
#if (QT_VERSION < 0x040000) #if (TQT_VERSION < 0x040000)
#error "Bad qt version: too old" #error "Bad qt version: too old"
#endif #endif
],[return 0; ],SS_QTX_LINKED_OK="TRUE",SS_QTX_LINKED_OK="FALSE") ],[return 0; ],SS_QTX_LINKED_OK="TRUE",SS_QTX_LINKED_OK="FALSE")

@ -2076,7 +2076,7 @@ AC_DEFUN([AC_SS_ENSURE_CAN_COMPILE_X_AND_QT4],
LDFLAGS="-s $LDFLAGS" LDFLAGS="-s $LDFLAGS"
AC_TRY_LINK([ AC_TRY_LINK([
#include <qglobal.h> #include <qglobal.h>
#if (QT_VERSION < 0x040000) #if (TQT_VERSION < 0x040000)
#error "Bad qt version: too old" #error "Bad qt version: too old"
#endif #endif
],[return 0; ],SS_QTX_LINKED_OK="TRUE",SS_QTX_LINKED_OK="FALSE") ],[return 0; ],SS_QTX_LINKED_OK="TRUE",SS_QTX_LINKED_OK="FALSE")

@ -886,7 +886,7 @@ For the moment, in random order:
#ifdef COMPILE_USE_QT4 #ifdef COMPILE_USE_QT4
to check if the compilation requires Qt 4.x or Qt 3.x. to check if the compilation requires Qt 4.x or Qt 3.x.
Later this *might* be automatically replaced with Later this *might* be automatically replaced with
#if QT_VERSION >= 0x040000 #if TQT_VERSION >= 0x040000
- Use: - Use:
./configure --enable-debug --enable-qt4 --with-qt4-moc=/path/moc ./configure --enable-debug --enable-qt4 --with-qt4-moc=/path/moc

Loading…
Cancel
Save