Automated update from Qt3

pull/1/head
Timothy Pearson 12 years ago
parent 605772f9f0
commit 43db215f60

2
configure vendored

@ -2985,7 +2985,7 @@ if [ "$CFG_LARGEFILE" = "yes" ]; then
fi fi
$unixtests/ptrsize.test $XQMAKESPEC $OPT_VERBOSE $relpath $outpath $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 if [ ! -z "$QT_MAC_VERSION" ]; then
echo "#define QT_MACOSX_VERSION ${QT_MAC_VERSION} /*from config.tests*/" >>$outpath/include/ntqconfig.h.new echo "#define QT_MACOSX_VERSION ${QT_MAC_VERSION} /*from config.tests*/" >>$outpath/include/ntqconfig.h.new

@ -1,17 +1,17 @@
#include <ntqglobal.h> #include <ntqglobal.h>
#include <ntqconfig.h> #include <ntqconfig.h>
#ifndef QT_POINTER_SIZE #ifndef TQT_POINTER_SIZE
# ifdef Q_OS_WIN32 # ifdef Q_OS_WIN32
# define QT_POINTER_SIZE 4 # define TQT_POINTER_SIZE 4
# elif Q_OS_WIN64 # elif Q_OS_WIN64
# define QT_POINTER_SIZE 8 # define TQT_POINTER_SIZE 8
# else # else
# error This platform is unsupported # error This platform is unsupported
# endif # 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 #ifdef UNICODE
# undef UNICODE # undef UNICODE

@ -6,17 +6,17 @@ diff -du ./config.h /home/harald/troll/qt-3.3/src/3rdparty/sqlite/config.h
+#include <ntqglobal.h> +#include <ntqglobal.h>
+#include <ntqconfig.h> +#include <ntqconfig.h>
+ +
+#ifndef QT_POINTER_SIZE +#ifndef TQT_POINTER_SIZE
+# ifdef Q_OS_WIN32 +# ifdef Q_OS_WIN32
+# define QT_POINTER_SIZE 4 +# define TQT_POINTER_SIZE 4
+# elif Q_OS_WIN64 +# elif Q_OS_WIN64
+# define QT_POINTER_SIZE 8 +# define TQT_POINTER_SIZE 8
+# else +# else
+# error This platform is unsupported +# error This platform is unsupported
+# endif +# 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 +#ifdef UNICODE
+# undef UNICODE +# undef UNICODE

Loading…
Cancel
Save