blob: c1117407125ef2dafa3a430df3e6b81a7eb4ee90 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
|
--- plugins/src/sqldrivers/sqlite/sqlite.pro
+++ plugins/src/sqldrivers/sqlite/sqlite.pro
@@ -10,6 +10,9 @@
unix {
OBJECTS_DIR = .obj
+ !contains( LIBS, .*sqlite.* ) {
+ LIBS *= -lsqlite
+ }
}
win32 {
@@ -23,54 +26,6 @@
# }
}
-!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
--- src/tools/qcstring.cpp
+++ 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
/*****************************************************************************
|
