diff options
| author | Darrell Anderson <[email protected]> | 2012-08-08 15:38:47 -0500 |
|---|---|---|
| committer | Darrell Anderson <[email protected]> | 2012-08-08 15:38:47 -0500 |
| commit | 785106b36c47923c338b6d3d61584eea448863ca (patch) | |
| tree | 6b2bbbde4a5ff5e43c1c9ec31ad0bd72ea43e0df /src/3rdparty | |
| parent | 7d22e97622a6b963382b88aac6dfde06a2cd8f03 (diff) | |
| parent | 43db215f601fd50f1fd8b502fae30c75c1bdee4a (diff) | |
| download | tqt3-785106b36c47923c338b6d3d61584eea448863ca.tar.gz tqt3-785106b36c47923c338b6d3d61584eea448863ca.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3
Diffstat (limited to 'src/3rdparty')
| -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 |