From 43db215f601fd50f1fd8b502fae30c75c1bdee4a Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Wed, 8 Aug 2012 14:25:22 -0500
Subject: [PATCH] Automated update from Qt3

---
 configure                           |  2 +-
 src/3rdparty/sqlite/config.h        | 10 +++++-----
 src/3rdparty/sqlite/trolltech.patch | 10 +++++-----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/configure b/configure
index eb3ba1cf..cce8ec09 100755
--- a/configure
+++ b/configure
@@ -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 b17d48a8..83363661 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 81d408d1..db15f9b6 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