You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
83 lines
3.3 KiB
83 lines
3.3 KiB
12 years ago
|
Index: plugins/src/sqldrivers/sqlite/sqlite.pro
|
||
|
|
===================================================================
|
||
|
|
--- plugins/src/sqldrivers/sqlite/sqlite.pro.orig
|
||
|
|
+++ plugins/src/sqldrivers/sqlite/sqlite.pro
|
||
|
|
@@ -10,6 +10,9 @@ SOURCES = smain.cpp \
|
||
|
|
|
||
|
|
unix {
|
||
|
|
OBJECTS_DIR = .obj
|
||
|
|
+ !contains( LIBS, .*sqlite.* ) {
|
||
|
|
+ LIBS *= -lsqlite
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
|
||
|
|
win32 {
|
||
|
|
@@ -23,54 +26,6 @@ win32 {
|
||
|
|
# }
|
||
|
|
}
|
||
|
|
|
||
|
|
-!contains( LIBS, .*sqlite.* ) {
|
||
|
|
- INCLUDEPATH += ../../../../src/3rdparty/sqlite
|
||
|
|
-
|
||
|
|
- HEADERS += ../../../../src/3rdparty/sqlite/btree.h \
|
||
|
|
- ../../../../src/3rdparty/sqlite/config.h \
|
||
|
|
- ../../../../src/3rdparty/sqlite/hash.h \
|
||
|
|
- ../../../../src/3rdparty/sqlite/opcodes.h \
|
||
|
|
- ../../../../src/3rdparty/sqlite/os.h \
|
||
|
|
- ../../../../src/3rdparty/sqlite/pager.h \
|
||
|
|
- ../../../../src/3rdparty/sqlite/parse.h \
|
||
|
|
- ../../../../src/3rdparty/sqlite/sqlite.h \
|
||
|
|
- ../../../../src/3rdparty/sqlite/sqliteInt.h \
|
||
|
|
- ../../../../src/3rdparty/sqlite/vdbe.h \
|
||
|
|
- ../../../../src/3rdparty/sqlite/vdbeInt.h
|
||
|
|
-
|
||
|
|
- SOURCES += ../../../../src/3rdparty/sqlite/attach.c \
|
||
|
|
- ../../../../src/3rdparty/sqlite/auth.c \
|
||
|
|
- ../../../../src/3rdparty/sqlite/btree.c \
|
||
|
|
- ../../../../src/3rdparty/sqlite/btree_rb.c \
|
||
|
|
- ../../../../src/3rdparty/sqlite/build.c \
|
||
|
|
- ../../../../src/3rdparty/sqlite/copy.c \
|
||
|
|
- ../../../../src/3rdparty/sqlite/date.c \
|
||
|
|
- ../../../../src/3rdparty/sqlite/delete.c \
|
||
|
|
- ../../../../src/3rdparty/sqlite/expr.c \
|
||
|
|
- ../../../../src/3rdparty/sqlite/func.c \
|
||
|
|
- ../../../../src/3rdparty/sqlite/hash.c \
|
||
|
|
- ../../../../src/3rdparty/sqlite/insert.c \
|
||
|
|
- ../../../../src/3rdparty/sqlite/main.c \
|
||
|
|
- ../../../../src/3rdparty/sqlite/opcodes.c \
|
||
|
|
- ../../../../src/3rdparty/sqlite/os.c \
|
||
|
|
- ../../../../src/3rdparty/sqlite/pager.c \
|
||
|
|
- ../../../../src/3rdparty/sqlite/parse.c \
|
||
|
|
- ../../../../src/3rdparty/sqlite/pragma.c \
|
||
|
|
- ../../../../src/3rdparty/sqlite/printf.c \
|
||
|
|
- ../../../../src/3rdparty/sqlite/random.c \
|
||
|
|
- ../../../../src/3rdparty/sqlite/select.c \
|
||
|
|
- ../../../../src/3rdparty/sqlite/shell.c \
|
||
|
|
- ../../../../src/3rdparty/sqlite/table.c \
|
||
|
|
- ../../../../src/3rdparty/sqlite/tokenize.c \
|
||
|
|
- ../../../../src/3rdparty/sqlite/trigger.c \
|
||
|
|
- ../../../../src/3rdparty/sqlite/update.c \
|
||
|
|
- ../../../../src/3rdparty/sqlite/util.c \
|
||
|
|
- ../../../../src/3rdparty/sqlite/vacuum.c \
|
||
|
|
- ../../../../src/3rdparty/sqlite/vdbe.c \
|
||
|
|
- ../../../../src/3rdparty/sqlite/vdbeaux.c \
|
||
|
|
- ../../../../src/3rdparty/sqlite/where.c
|
||
|
|
-}
|
||
|
|
-
|
||
|
|
REQUIRES = sql
|
||
|
|
|
||
|
|
target.path += $$plugins.path/sqldrivers
|
||
|
|
Index: src/tools/qcstring.cpp
|
||
|
|
===================================================================
|
||
|
|
--- src/tools/qcstring.cpp.orig
|
||
|
|
+++ src/tools/qcstring.cpp
|
||
|
|
@@ -53,7 +53,7 @@
|
||
|
|
#include <ctype.h>
|
||
|
|
#include <limits.h>
|
||
|
|
#ifndef QT_NO_COMPRESS
|
||
|
|
-#include "../3rdparty/zlib/zlib.h"
|
||
|
|
+#include <zlib.h>
|
||
|
|
#endif
|
||
|
|
|
||
|
|
/*****************************************************************************
|