summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-01-26 23:32:43 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-01-26 23:32:43 -0600
commitea318d1431c89e647598c510c4245c6571aa5f46 (patch)
tree996d29b80c30d453dda86d1a23162d441628f169 /src/3rdparty
parentaaf89d4b48f69c9293feb187db26362e550b5561 (diff)
downloadtqt3-ea318d1431c89e647598c510c4245c6571aa5f46.tar.gz
tqt3-ea318d1431c89e647598c510c4245c6571aa5f46.zip
Update to latest tqt3 automated conversion
Diffstat (limited to 'src/3rdparty')
-rw-r--r--src/3rdparty/sqlite/config.h4
-rw-r--r--src/3rdparty/sqlite/trolltech.patch4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/3rdparty/sqlite/config.h b/src/3rdparty/sqlite/config.h
index ae29a5723..b17d48a88 100644
--- a/src/3rdparty/sqlite/config.h
+++ b/src/3rdparty/sqlite/config.h
@@ -1,5 +1,5 @@
-#include <qglobal.h>
-#include <qconfig.h>
+#include <ntqglobal.h>
+#include <ntqconfig.h>
#ifndef QT_POINTER_SIZE
# ifdef Q_OS_WIN32
diff --git a/src/3rdparty/sqlite/trolltech.patch b/src/3rdparty/sqlite/trolltech.patch
index cbafffbd4..81d408d1a 100644
--- a/src/3rdparty/sqlite/trolltech.patch
+++ b/src/3rdparty/sqlite/trolltech.patch
@@ -3,8 +3,8 @@ diff -du ./config.h /home/harald/troll/qt-3.3/src/3rdparty/sqlite/config.h
+++ /home/harald/troll/qt-3.3/src/3rdparty/sqlite/config.h 2004-01-08 14:29:23.000000000 +0100
@@ -1 +1,23 @@
-#define SQLITE_PTR_SZ 4
-+#include <qglobal.h>
-+#include <qconfig.h>
++#include <ntqglobal.h>
++#include <ntqconfig.h>
+
+#ifndef QT_POINTER_SIZE
+# ifdef Q_OS_WIN32