diff options
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | src/3rdparty/sqlite/config.h | 10 | ||||
| -rw-r--r-- | src/3rdparty/sqlite/trolltech.patch | 10 |
3 files changed, 11 insertions, 11 deletions
@@ -2985,7 +2985,7 @@ if [ "$CFG_LARGEFILE" = "yes" ]; then fi $unixtests/ptrsize.test $XQMAKESPEC $OPT_VERBOSE $relpath $outpath -echo "#define QT_POINTER_SIZE $?" >>$outpath/include/ntqconfig.h.new +echo "#define TQT_POINTER_SIZE $?" >>$outpath/include/ntqconfig.h.new if [ ! -z "$QT_MAC_VERSION" ]; then echo "#define QT_MACOSX_VERSION ${QT_MAC_VERSION} /*from config.tests*/" >>$outpath/include/ntqconfig.h.new diff --git a/src/3rdparty/sqlite/config.h b/src/3rdparty/sqlite/config.h index b17d48a88..833636614 100644 --- a/src/3rdparty/sqlite/config.h +++ b/src/3rdparty/sqlite/config.h @@ -1,17 +1,17 @@ #include <ntqglobal.h> #include <ntqconfig.h> -#ifndef QT_POINTER_SIZE +#ifndef TQT_POINTER_SIZE # ifdef Q_OS_WIN32 -# define QT_POINTER_SIZE 4 +# define TQT_POINTER_SIZE 4 # elif Q_OS_WIN64 -# define QT_POINTER_SIZE 8 +# define TQT_POINTER_SIZE 8 # else # error This platform is unsupported # endif -#endif /* QT_POINTER_SIZE */ +#endif /* TQT_POINTER_SIZE */ -#define SQLITE_PTR_SZ QT_POINTER_SIZE +#define SQLITE_PTR_SZ TQT_POINTER_SIZE #ifdef UNICODE # undef UNICODE diff --git a/src/3rdparty/sqlite/trolltech.patch b/src/3rdparty/sqlite/trolltech.patch index 81d408d1a..db15f9b6c 100644 --- a/src/3rdparty/sqlite/trolltech.patch +++ b/src/3rdparty/sqlite/trolltech.patch @@ -6,17 +6,17 @@ diff -du ./config.h /home/harald/troll/qt-3.3/src/3rdparty/sqlite/config.h +#include <ntqglobal.h> +#include <ntqconfig.h> + -+#ifndef QT_POINTER_SIZE ++#ifndef TQT_POINTER_SIZE +# ifdef Q_OS_WIN32 -+# define QT_POINTER_SIZE 4 ++# define TQT_POINTER_SIZE 4 +# elif Q_OS_WIN64 -+# define QT_POINTER_SIZE 8 ++# define TQT_POINTER_SIZE 8 +# else +# error This platform is unsupported +# endif -+#endif /* QT_POINTER_SIZE */ ++#endif /* TQT_POINTER_SIZE */ + -+#define SQLITE_PTR_SZ QT_POINTER_SIZE ++#define SQLITE_PTR_SZ TQT_POINTER_SIZE + +#ifdef UNICODE +# undef UNICODE |