diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-08-08 14:25:22 -0500 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-08-08 14:25:22 -0500 |
commit | 43db215f601fd50f1fd8b502fae30c75c1bdee4a (patch) | |
tree | a77b858781115325c1509794fffa77f770832254 /src | |
parent | 605772f9f09b53568cdf7b8b10b326b32594f93d (diff) | |
download | tqt3-43db215f601fd50f1fd8b502fae30c75c1bdee4a.tar.gz tqt3-43db215f601fd50f1fd8b502fae30c75c1bdee4a.zip |
Automated update from Qt3
Diffstat (limited to 'src')
-rw-r--r-- | src/3rdparty/sqlite/config.h | 10 | ||||
-rw-r--r-- | src/3rdparty/sqlite/trolltech.patch | 10 |
2 files changed, 10 insertions, 10 deletions
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 |