Mercurial > mxe-octave
annotate src/qt-1-win32.patch @ 1107:4dacc284e354
package qt: updated patch attributions
| author | Mark Brand <mabrand@mabrand.nl> |
|---|---|
| date | Tue, 31 Aug 2010 09:06:01 +0200 |
| parents | 3cd158b49847 |
| children | 138a2ff15e91 |
| rev | line source |
|---|---|
|
972
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
1 This file is part of mingw-cross-env. |
|
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
2 See doc/index.html for further information. |
|
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
3 |
| 1097 | 4 Commits backported (cherry-picked) from Qt 4.7 branch. |
| 5 http://qt.gitorious.org/qt | |
| 6 | |
| 7 commit b6d6681dc40ce34f231e74a63c13855b1e248aa1 | |
| 8 Author: Mark Brand <mabrand@mabrand.nl> | |
| 9 Date: Wed Jul 7 12:05:35 2010 +0200 | |
| 10 | |
| 11 Fixed whitespace formatting | |
| 12 | |
| 13 Merge-request: 715 | |
| 14 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | |
| 15 (cherry picked from commit 42fe2bfb65c85fc630efe32aa1d62d66f2caab2a) | |
| 16 | |
| 17 diff --git a/src/plugins/sqldrivers/db2/db2.pro b/src/plugins/sqldrivers/db2/db2.pro | |
| 18 index 5223beb..25ca499 100644 | |
| 19 --- a/src/plugins/sqldrivers/db2/db2.pro | |
| 20 +++ b/src/plugins/sqldrivers/db2/db2.pro | |
|
1040
0cf0c907b475
improvements for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
1015
diff
changeset
|
21 @@ -1,4 +1,4 @@ |
| 1097 | 22 -TARGET = qsqldb2 |
| 23 +TARGET = qsqldb2 | |
|
1015
7997c04d4bef
upgrade package qt to 4.7.0-beta1 (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
1002
diff
changeset
|
24 |
| 1097 | 25 HEADERS = ../../../sql/drivers/db2/qsql_db2.h |
| 26 SOURCES = main.cpp \ | |
| 27 diff --git a/src/plugins/sqldrivers/ibase/ibase.pro b/src/plugins/sqldrivers/ibase/ibase.pro | |
| 28 index ec2bc7b..bb73adb 100644 | |
| 29 --- a/src/plugins/sqldrivers/ibase/ibase.pro | |
| 30 +++ b/src/plugins/sqldrivers/ibase/ibase.pro | |
| 31 @@ -1,4 +1,4 @@ | |
| 32 -TARGET = qsqlibase | |
| 33 +TARGET = qsqlibase | |
|
1015
7997c04d4bef
upgrade package qt to 4.7.0-beta1 (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
1002
diff
changeset
|
34 |
| 1097 | 35 HEADERS = ../../../sql/drivers/ibase/qsql_ibase.h |
| 36 SOURCES = main.cpp \ | |
| 37 diff --git a/src/plugins/sqldrivers/mysql/mysql.pro b/src/plugins/sqldrivers/mysql/mysql.pro | |
| 38 index 9f5c619..b808c8e 100644 | |
| 39 --- a/src/plugins/sqldrivers/mysql/mysql.pro | |
| 40 +++ b/src/plugins/sqldrivers/mysql/mysql.pro | |
| 41 @@ -1,4 +1,4 @@ | |
| 42 -TARGET = qsqlmysql | |
| 43 +TARGET = qsqlmysql | |
|
1040
0cf0c907b475
improvements for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
1015
diff
changeset
|
44 |
| 1097 | 45 HEADERS = ../../../sql/drivers/mysql/qsql_mysql.h |
| 46 SOURCES = main.cpp \ | |
| 47 diff --git a/src/plugins/sqldrivers/oci/oci.pro b/src/plugins/sqldrivers/oci/oci.pro | |
| 48 index 3bf70a1..d75827e 100644 | |
| 49 --- a/src/plugins/sqldrivers/oci/oci.pro | |
| 50 +++ b/src/plugins/sqldrivers/oci/oci.pro | |
| 51 @@ -1,4 +1,4 @@ | |
| 52 -TARGET = qsqloci | |
| 53 +TARGET = qsqloci | |
|
1040
0cf0c907b475
improvements for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
1015
diff
changeset
|
54 |
| 1097 | 55 HEADERS = ../../../sql/drivers/oci/qsql_oci.h |
| 56 SOURCES = main.cpp \ | |
| 57 diff --git a/src/plugins/sqldrivers/odbc/odbc.pro b/src/plugins/sqldrivers/odbc/odbc.pro | |
| 58 index 2bf85f1..70070db 100644 | |
| 59 --- a/src/plugins/sqldrivers/odbc/odbc.pro | |
| 60 +++ b/src/plugins/sqldrivers/odbc/odbc.pro | |
| 61 @@ -1,4 +1,4 @@ | |
| 62 -TARGET = qsqlodbc | |
| 63 +TARGET = qsqlodbc | |
|
1040
0cf0c907b475
improvements for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
1015
diff
changeset
|
64 |
| 1097 | 65 HEADERS = ../../../sql/drivers/odbc/qsql_odbc.h |
| 66 SOURCES = main.cpp \ | |
| 67 diff --git a/src/plugins/sqldrivers/psql/psql.pro b/src/plugins/sqldrivers/psql/psql.pro | |
| 68 index 80a5348..9586695 100644 | |
| 69 --- a/src/plugins/sqldrivers/psql/psql.pro | |
| 70 +++ b/src/plugins/sqldrivers/psql/psql.pro | |
| 71 @@ -1,4 +1,4 @@ | |
| 72 -TARGET = qsqlpsql | |
| 73 +TARGET = qsqlpsql | |
|
1015
7997c04d4bef
upgrade package qt to 4.7.0-beta1 (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
1002
diff
changeset
|
74 |
| 1097 | 75 HEADERS = ../../../sql/drivers/psql/qsql_psql.h |
| 76 SOURCES = main.cpp \ | |
| 77 diff --git a/src/plugins/sqldrivers/sqlite/sqlite.pro b/src/plugins/sqldrivers/sqlite/sqlite.pro | |
| 78 index fb31233..75f04b9 100644 | |
| 79 --- a/src/plugins/sqldrivers/sqlite/sqlite.pro | |
| 80 +++ b/src/plugins/sqldrivers/sqlite/sqlite.pro | |
| 81 @@ -1,4 +1,4 @@ | |
| 82 -TARGET = qsqlite | |
| 83 +TARGET = qsqlite | |
|
1015
7997c04d4bef
upgrade package qt to 4.7.0-beta1 (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
1002
diff
changeset
|
84 |
| 1097 | 85 HEADERS = ../../../sql/drivers/sqlite/qsql_sqlite.h |
| 86 SOURCES = smain.cpp \ | |
| 87 diff --git a/src/plugins/sqldrivers/sqlite2/sqlite2.pro b/src/plugins/sqldrivers/sqlite2/sqlite2.pro | |
| 88 index 88db22a..0f6c19a 100644 | |
| 89 --- a/src/plugins/sqldrivers/sqlite2/sqlite2.pro | |
| 90 +++ b/src/plugins/sqldrivers/sqlite2/sqlite2.pro | |
| 91 @@ -1,4 +1,4 @@ | |
| 92 -TARGET = qsqlite2 | |
| 93 +TARGET = qsqlite2 | |
|
1015
7997c04d4bef
upgrade package qt to 4.7.0-beta1 (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
1002
diff
changeset
|
94 |
| 1097 | 95 HEADERS = ../../../sql/drivers/sqlite2/qsql_sqlite2.h |
| 96 SOURCES = smain.cpp \ | |
| 97 diff --git a/src/plugins/sqldrivers/tds/tds.pro b/src/plugins/sqldrivers/tds/tds.pro | |
| 98 index 08a166b..ba40be5 100644 | |
| 99 --- a/src/plugins/sqldrivers/tds/tds.pro | |
| 100 +++ b/src/plugins/sqldrivers/tds/tds.pro | |
| 101 @@ -1,4 +1,4 @@ | |
| 102 -TARGET = qsqltds | |
| 103 +TARGET = qsqltds | |
| 104 | |
| 105 HEADERS = ../../../sql/drivers/tds/qsql_tds.h | |
|
1015
7997c04d4bef
upgrade package qt to 4.7.0-beta1 (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
1002
diff
changeset
|
106 |
| 1097 | 107 |
| 108 commit 51d53d80f5e3c4d53b02043b0e85968be097cb68 | |
| 109 Author: Mark Brand <mabrand@mabrand.nl> | |
| 110 Date: Thu Aug 26 22:06:23 2010 +0200 | |
| 111 | |
| 112 Revert "Fixed automatic sqlite extraction on Symbian makefile build system." | |
| 113 | |
| 114 This reverts commit 0aa77f3afe01de462edf0ee6a0bdf78854431cf1. | |
| 115 | |
| 116 Reverted to avoid collisions with d7557de99b38031906c17c54496cb76a13dec5f7 | |
| 117 on drivers.pri from 4.7 branch. | |
| 118 | |
| 119 diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf | |
| 120 index 7ec5c6c..c1b31e5 100644 | |
| 121 --- a/mkspecs/common/symbian/symbian.conf | |
| 122 +++ b/mkspecs/common/symbian/symbian.conf | |
| 123 @@ -105,7 +105,6 @@ QMAKE_IDL = midl | |
| 124 QMAKE_LIB = ar -ru | |
| 125 QMAKE_RC = windres | |
| 126 QMAKE_ZIP = zip -r -9 | |
| 127 -QMAKE_UNZIP = unzip -o | |
|
1015
7997c04d4bef
upgrade package qt to 4.7.0-beta1 (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
1002
diff
changeset
|
128 |
| 1097 | 129 QMAKE_TAR = tar -cf |
| 130 QMAKE_GZIP = gzip -9f | |
| 131 diff --git a/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pri b/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pri | |
| 132 deleted file mode 100644 | |
| 133 index ab8d846..0000000 | |
| 134 --- a/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pri | |
| 135 +++ /dev/null | |
| 136 @@ -1,38 +0,0 @@ | |
| 137 -# We just want to include the sqlite3 binaries for Symbian for platforms that do not have them. | |
| 138 -!symbian-abld:!symbian-sbsv2 { | |
| 139 - !symbian_no_export_sqlite:!exists($${EPOCROOT}epoc32/release/armv5/lib/sqlite3.dso) { | |
| 140 - symbian_sqlite3_zip_file = $$PWD/SQLite3_v9.2.zip | |
| 141 - | |
| 142 - # The QMAKE_COPY section is to update timestamp on the file. | |
| 143 - symbian_sqlite3_header.input = symbian_sqlite3_zip_file | |
| 144 - symbian_sqlite3_header.output = sqlite3.h | |
| 145 - !isEmpty(MOC_DIR):symbian_sqlite3_header.output = $$MOC_DIR/$$symbian_sqlite3_header.output | |
| 146 - symbian_sqlite3_header.CONFIG = combine no_link | |
| 147 - symbian_sqlite3_header.dependency_type = TYPE_C | |
| 148 - symbian_sqlite3_header.commands = $$QMAKE_UNZIP -j ${QMAKE_FILE_NAME} epoc32/include/stdapis/${QMAKE_FILE_OUT_BASE}.h \ | |
| 149 - && $$QMAKE_COPY ${QMAKE_FILE_OUT_BASE}.h ${QMAKE_FILE_OUT}.tmp \ | |
| 150 - && $$QMAKE_DEL_FILE ${QMAKE_FILE_OUT_BASE}.h \ | |
| 151 - && $$QMAKE_MOVE ${QMAKE_FILE_OUT}.tmp ${QMAKE_FILE_OUT} | |
| 152 - QMAKE_EXTRA_COMPILERS += symbian_sqlite3_header | |
| 153 - | |
| 154 - # The QMAKE_COPY section is to update timestamp on the file. | |
| 155 - symbian_sqlite3_dso.input = symbian_sqlite3_zip_file | |
| 156 - symbian_sqlite3_dso.output = sqlite3.dso | |
| 157 - !isEmpty(OBJECTS_DIR):symbian_sqlite3_dso.output = $$OBJECTS_DIR/$$symbian_sqlite3_dso.output | |
| 158 - symbian_sqlite3_dso.CONFIG = combine no_link target_predeps | |
| 159 - symbian_sqlite3_dso.commands = $$QMAKE_UNZIP -j ${QMAKE_FILE_NAME} epoc32/release/armv5/lib/${QMAKE_FILE_OUT_BASE}.dso \ | |
| 160 - && $$QMAKE_COPY ${QMAKE_FILE_OUT_BASE}.dso ${QMAKE_FILE_OUT}.tmp \ | |
| 161 - && $$QMAKE_DEL_FILE ${QMAKE_FILE_OUT_BASE}.dso \ | |
| 162 - && $$QMAKE_MOVE ${QMAKE_FILE_OUT}.tmp ${QMAKE_FILE_OUT} | |
| 163 - QMAKE_EXTRA_COMPILERS += symbian_sqlite3_dso | |
| 164 - | |
| 165 - symbian_sqlite3_ver_dso.input = symbian_sqlite3_zip_file | |
| 166 - symbian_sqlite3_ver_dso.output = sqlite3{00060003}.dso | |
| 167 - !isEmpty(OBJECTS_DIR):symbian_sqlite3_ver_dso.output = $$OBJECTS_DIR/$$symbian_sqlite3_ver_dso.output | |
| 168 - symbian_sqlite3_ver_dso.CONFIG = $$symbian_sqlite3_dso.CONFIG | |
| 169 - symbian_sqlite3_ver_dso.commands = $$symbian_sqlite3_dso.commands | |
| 170 - QMAKE_EXTRA_COMPILERS += symbian_sqlite3_ver_dso | |
| 171 - | |
| 172 - QMAKE_LIBDIR *= $$OBJECTS_DIR | |
| 173 - } | |
| 174 -} | |
| 175 diff --git a/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pro b/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pro | |
| 176 index 0d233e6..691cce1 100644 | |
| 177 --- a/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pro | |
| 178 +++ b/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pro | |
| 179 @@ -2,7 +2,7 @@ | |
| 180 TEMPLATE = subdirs | |
|
1050
3d74c8e772ad
enable webkit in package qt
Mark Brand <mabrand@mabrand.nl>
parents:
1040
diff
changeset
|
181 |
| 1097 | 182 # We just want to export the sqlite3 binaries for Symbian for platforms that do not have them. |
| 183 -symbian-abld|symbian-sbsv2 { | |
| 184 +symbian { | |
| 185 !symbian_no_export_sqlite:!exists($${EPOCROOT}epoc32/release/armv5/lib/sqlite3.dso) { | |
| 186 BLD_INF_RULES.prj_exports += ":zip SQLite3_v9.2.zip" | |
|
972
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
187 } |
| 1097 | 188 diff --git a/src/sql/drivers/drivers.pri b/src/sql/drivers/drivers.pri |
| 189 index c68442d..05e7265 100644 | |
| 190 --- a/src/sql/drivers/drivers.pri | |
| 191 +++ b/src/sql/drivers/drivers.pri | |
| 192 @@ -114,8 +114,6 @@ contains(sql-drivers, sqlite) { | |
| 193 QMAKE_CXXFLAGS *= $$QT_CFLAGS_SQLITE | |
|
1015
7997c04d4bef
upgrade package qt to 4.7.0-beta1 (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
1002
diff
changeset
|
194 } |
|
7997c04d4bef
upgrade package qt to 4.7.0-beta1 (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
1002
diff
changeset
|
195 |
| 1097 | 196 - symbian:include(../../plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pri) |
| 197 - | |
| 198 HEADERS += drivers/sqlite/qsql_sqlite.h | |
| 199 SOURCES += drivers/sqlite/qsql_sqlite.cpp | |
|
972
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
200 } |
| 1097 | 201 |
| 202 commit c24f1ac5a184d25b137a3a66b3f6f4d123de4bbd | |
| 203 Author: Mark Brand <mabrand@mabrand.nl> | |
| 204 Date: Wed Jul 7 12:05:36 2010 +0200 | |
| 205 | |
| 206 Consolidate sql driver configuration redundancy | |
| 207 | |
| 208 Previously sql driver recipes each appeared in both the plugin | |
| 209 pro file and src/sql/drivers/drivers.pri for building into QtSql. | |
| 210 | |
| 211 Split driver recipes into shared pri files. | |
| 212 Also split bundled 3rd party sqlite code recipe into a shared pri. | |
| 213 | |
| 214 Merge-request: 715 | |
| 215 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | |
| 216 (cherry picked from commit d7557de99b38031906c17c54496cb76a13dec5f7) | |
| 217 | |
| 218 diff --git a/src/3rdparty/sqlite.pri b/src/3rdparty/sqlite.pri | |
| 219 new file mode 100644 | |
| 220 index 0000000..575412d | |
| 221 --- /dev/null | |
| 222 +++ b/src/3rdparty/sqlite.pri | |
| 223 @@ -0,0 +1,4 @@ | |
| 224 +CONFIG(release, debug|release):DEFINES *= NDEBUG | |
| 225 +DEFINES += SQLITE_OMIT_LOAD_EXTENSION SQLITE_OMIT_COMPLETE | |
| 226 +INCLUDEPATH += $$PWD/sqlite | |
| 227 +SOURCES += $$PWD/sqlite/sqlite3.c | |
| 228 diff --git a/src/plugins/sqldrivers/db2/db2.pro b/src/plugins/sqldrivers/db2/db2.pro | |
| 229 index 25ca499..e053f37 100644 | |
| 230 --- a/src/plugins/sqldrivers/db2/db2.pro | |
| 231 +++ b/src/plugins/sqldrivers/db2/db2.pro | |
| 232 @@ -1,10 +1,6 @@ | |
| 233 TARGET = qsqldb2 | |
| 234 | |
| 235 -HEADERS = ../../../sql/drivers/db2/qsql_db2.h | |
| 236 -SOURCES = main.cpp \ | |
| 237 - ../../../sql/drivers/db2/qsql_db2.cpp | |
| 238 - | |
| 239 -unix:!contains( LIBS, .*db2.* ):LIBS *= -ldb2 | |
| 240 -win32:!contains( LIBS, .*db2.* ):LIBS *= -ldb2cli | |
| 241 +SOURCES = main.cpp | |
| 242 +include(../../../sql/drivers/db2/qsql_db2.pri) | |
| 243 | |
| 244 include(../qsqldriverbase.pri) | |
| 245 diff --git a/src/plugins/sqldrivers/ibase/ibase.pro b/src/plugins/sqldrivers/ibase/ibase.pro | |
| 246 index bb73adb..7870ec8 100644 | |
| 247 --- a/src/plugins/sqldrivers/ibase/ibase.pro | |
| 248 +++ b/src/plugins/sqldrivers/ibase/ibase.pro | |
| 249 @@ -1,14 +1,6 @@ | |
| 250 TARGET = qsqlibase | |
|
972
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
251 |
| 1097 | 252 -HEADERS = ../../../sql/drivers/ibase/qsql_ibase.h |
| 253 -SOURCES = main.cpp \ | |
| 254 - ../../../sql/drivers/ibase/qsql_ibase.cpp | |
| 255 - | |
| 256 -unix:!contains( LIBS, .*gds.* ):!contains( LIBS, .*libfb.* ):LIBS *= -lgds | |
| 257 - | |
| 258 -win32:!contains( LIBS, .*gds.* ):!contains( LIBS, .*fbclient.* ) { | |
| 259 - !win32-borland:LIBS *= -lgds32_ms | |
| 260 - win32-borland:LIBS += gds32.lib | |
| 261 -} | |
| 262 +SOURCES = main.cpp | |
| 263 +include(../../../sql/drivers/ibase/qsql_ibase.pri) | |
| 264 | |
| 265 include(../qsqldriverbase.pri) | |
| 266 diff --git a/src/plugins/sqldrivers/mysql/mysql.pro b/src/plugins/sqldrivers/mysql/mysql.pro | |
| 267 index b808c8e..b6d42ff 100644 | |
| 268 --- a/src/plugins/sqldrivers/mysql/mysql.pro | |
| 269 +++ b/src/plugins/sqldrivers/mysql/mysql.pro | |
| 270 @@ -1,23 +1,6 @@ | |
| 271 TARGET = qsqlmysql | |
|
972
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
272 |
| 1097 | 273 -HEADERS = ../../../sql/drivers/mysql/qsql_mysql.h |
| 274 -SOURCES = main.cpp \ | |
| 275 - ../../../sql/drivers/mysql/qsql_mysql.cpp | |
| 276 - | |
| 277 -unix: { | |
| 278 - isEmpty(QT_LFLAGS_MYSQL) { | |
| 279 - !contains(LIBS, .*mysqlclient.*):!contains(LIBS, .*mysqld.*) { | |
| 280 - use_libmysqlclient_r:LIBS *= -lmysqlclient_r | |
| 281 - else:LIBS *= -lmysqlclient | |
| 282 - } | |
| 283 - } else { | |
| 284 - LIBS *= $$QT_LFLAGS_MYSQL | |
| 285 - QMAKE_CXXFLAGS *= $$QT_CFLAGS_MYSQL | |
| 286 - } | |
| 287 -} | |
| 288 - | |
| 289 -win32:!contains(LIBS, .*mysql.*):!contains(LIBS, .*mysqld.*) { | |
| 290 - LIBS *= -llibmysql | |
| 291 -} | |
| 292 +SOURCES = main.cpp | |
| 293 +include(../../../sql/drivers/mysql/qsql_mysql.pri) | |
| 294 | |
| 295 include(../qsqldriverbase.pri) | |
| 296 diff --git a/src/plugins/sqldrivers/oci/oci.pro b/src/plugins/sqldrivers/oci/oci.pro | |
| 297 index d75827e..d7dcce9 100644 | |
| 298 --- a/src/plugins/sqldrivers/oci/oci.pro | |
| 299 +++ b/src/plugins/sqldrivers/oci/oci.pro | |
| 300 @@ -1,13 +1,6 @@ | |
| 301 TARGET = qsqloci | |
|
972
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
302 |
| 1097 | 303 -HEADERS = ../../../sql/drivers/oci/qsql_oci.h |
| 304 -SOURCES = main.cpp \ | |
| 305 - ../../../sql/drivers/oci/qsql_oci.cpp | |
| 306 - | |
| 307 -win32:LIBS *= -loci | |
| 308 - | |
| 309 -unix:!contains( LIBS, .*clnts.* ):LIBS *= -lclntsh | |
| 310 - | |
| 311 -macx:QMAKE_LFLAGS += -Wl,-flat_namespace,-U,_environ | |
| 312 +SOURCES = main.cpp | |
| 313 +include(../../../sql/drivers/oci/qsql_oci.pri) | |
| 314 | |
| 315 include(../qsqldriverbase.pri) | |
| 316 diff --git a/src/plugins/sqldrivers/odbc/odbc.pro b/src/plugins/sqldrivers/odbc/odbc.pro | |
| 317 index 70070db..677eb6e 100644 | |
| 318 --- a/src/plugins/sqldrivers/odbc/odbc.pro | |
| 319 +++ b/src/plugins/sqldrivers/odbc/odbc.pro | |
| 320 @@ -1,19 +1,6 @@ | |
| 321 TARGET = qsqlodbc | |
|
972
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
322 |
| 1097 | 323 -HEADERS = ../../../sql/drivers/odbc/qsql_odbc.h |
| 324 -SOURCES = main.cpp \ | |
| 325 - ../../../sql/drivers/odbc/qsql_odbc.cpp | |
| 326 - | |
| 327 -unix { | |
| 328 - !contains( LIBS, .*odbc.* ) { | |
| 329 - LIBS *= $$QT_LFLAGS_ODBC | |
| 330 - } | |
| 331 - DEFINES += UNICODE | |
| 332 -} | |
| 333 - | |
| 334 -win32 { | |
| 335 - !win32-borland:LIBS *= -lodbc32 | |
| 336 - win32-borland:LIBS *= $(BCB)/lib/PSDK/odbc32.lib | |
| 337 -} | |
| 338 +SOURCES = main.cpp | |
| 339 +include(../../../sql/drivers/odbc/qsql_odbc.pri) | |
| 340 | |
| 341 include(../qsqldriverbase.pri) | |
| 342 diff --git a/src/plugins/sqldrivers/psql/psql.pro b/src/plugins/sqldrivers/psql/psql.pro | |
| 343 index 9586695..8276c0a 100644 | |
| 344 --- a/src/plugins/sqldrivers/psql/psql.pro | |
| 345 +++ b/src/plugins/sqldrivers/psql/psql.pro | |
| 346 @@ -1,18 +1,6 @@ | |
| 347 TARGET = qsqlpsql | |
| 348 | |
| 349 -HEADERS = ../../../sql/drivers/psql/qsql_psql.h | |
| 350 -SOURCES = main.cpp \ | |
| 351 - ../../../sql/drivers/psql/qsql_psql.cpp | |
| 352 - | |
| 353 -unix|win32-g++*: { | |
| 354 - !isEmpty(QT_LFLAGS_PSQL) { | |
| 355 - !contains(QT_CONFIG, system-zlib): QT_LFLAGS_PSQL -= -lz | |
| 356 - !static:LIBS *= $$QT_LFLAGS_PSQL | |
| 357 - QMAKE_CXXFLAGS *= $$QT_CFLAGS_PSQL | |
| 358 - } | |
| 359 - !contains(LIBS, .*pq.*):LIBS *= -lpq | |
| 360 -} | |
| 361 - | |
| 362 -win32:!win32-g++*:!contains(LIBS, .*pq.* ) LIBS *= -llibpq -lws2_32 -ladvapi32 | |
| 363 +SOURCES = main.cpp | |
| 364 +include(../../../sql/drivers/psql/qsql_psql.pri) | |
|
972
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
365 |
| 1097 | 366 include(../qsqldriverbase.pri) |
| 367 diff --git a/src/plugins/sqldrivers/sqlite/sqlite.pro b/src/plugins/sqldrivers/sqlite/sqlite.pro | |
| 368 index 75f04b9..f4c1671 100644 | |
| 369 --- a/src/plugins/sqldrivers/sqlite/sqlite.pro | |
| 370 +++ b/src/plugins/sqldrivers/sqlite/sqlite.pro | |
| 371 @@ -1,18 +1,7 @@ | |
| 372 TARGET = qsqlite | |
| 373 | |
| 374 -HEADERS = ../../../sql/drivers/sqlite/qsql_sqlite.h | |
| 375 -SOURCES = smain.cpp \ | |
| 376 - ../../../sql/drivers/sqlite/qsql_sqlite.cpp | |
| 377 - | |
| 378 -!system-sqlite:!contains( LIBS, .*sqlite.* ) { | |
| 379 - CONFIG(release, debug|release):DEFINES *= NDEBUG | |
| 380 - DEFINES += SQLITE_OMIT_LOAD_EXTENSION SQLITE_OMIT_COMPLETE | |
| 381 - INCLUDEPATH += ../../../3rdparty/sqlite | |
| 382 - SOURCES += ../../../3rdparty/sqlite/sqlite3.c | |
| 383 -} else { | |
| 384 - LIBS *= $$QT_LFLAGS_SQLITE | |
| 385 - QMAKE_CXXFLAGS *= $$QT_CFLAGS_SQLITE | |
| 386 -} | |
| 387 +SOURCES = smain.cpp | |
| 388 +include(../../../sql/drivers/sqlite/qsql_sqlite.pri) | |
| 389 | |
| 390 wince*: DEFINES += HAVE_LOCALTIME_S=0 | |
|
972
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
391 |
| 1097 | 392 diff --git a/src/plugins/sqldrivers/sqlite2/sqlite2.pro b/src/plugins/sqldrivers/sqlite2/sqlite2.pro |
| 393 index 0f6c19a..e6197b9 100644 | |
| 394 --- a/src/plugins/sqldrivers/sqlite2/sqlite2.pro | |
| 395 +++ b/src/plugins/sqldrivers/sqlite2/sqlite2.pro | |
| 396 @@ -1,9 +1,6 @@ | |
| 397 TARGET = qsqlite2 | |
| 398 | |
| 399 -HEADERS = ../../../sql/drivers/sqlite2/qsql_sqlite2.h | |
| 400 -SOURCES = smain.cpp \ | |
| 401 - ../../../sql/drivers/sqlite2/qsql_sqlite2.cpp | |
| 402 - | |
| 403 -!contains(LIBS, .*sqlite.*):LIBS *= -lsqlite | |
| 404 +SOURCES = smain.cpp | |
| 405 +include(../../../sql/drivers/sqlite2/qsql_sqlite2.pri) | |
|
972
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
406 |
| 1097 | 407 include(../qsqldriverbase.pri) |
| 408 diff --git a/src/plugins/sqldrivers/tds/tds.pro b/src/plugins/sqldrivers/tds/tds.pro | |
| 409 index ba40be5..b8e8ded 100644 | |
| 410 --- a/src/plugins/sqldrivers/tds/tds.pro | |
| 411 +++ b/src/plugins/sqldrivers/tds/tds.pro | |
| 412 @@ -1,15 +1,6 @@ | |
| 413 TARGET = qsqltds | |
|
972
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
414 |
| 1097 | 415 -HEADERS = ../../../sql/drivers/tds/qsql_tds.h |
| 416 - | |
| 417 -SOURCES = main.cpp \ | |
| 418 - ../../../sql/drivers/tds/qsql_tds.cpp | |
| 419 - | |
| 420 -unix:!contains( LIBS, .*sybdb.* ):LIBS *= -lsybdb | |
| 421 - | |
| 422 -win32 { | |
| 423 - !win32-borland:LIBS *= -lNTWDBLIB | |
| 424 - win32-borland:LIBS *= $(BCB)/lib/PSDK/NTWDBLIB.LIB | |
| 425 -} | |
| 426 +SOURCES = main.cpp | |
| 427 +include(../../../sql/drivers/tds/qsql_tds.pri) | |
|
972
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
428 |
|
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
429 include(../qsqldriverbase.pri) |
| 1097 | 430 diff --git a/src/sql/drivers/db2/qsql_db2.pri b/src/sql/drivers/db2/qsql_db2.pri |
| 431 new file mode 100644 | |
| 432 index 0000000..e53a8a0 | |
| 433 --- /dev/null | |
| 434 +++ b/src/sql/drivers/db2/qsql_db2.pri | |
| 435 @@ -0,0 +1,8 @@ | |
| 436 +HEADERS += $$PWD/qsql_db2.h | |
| 437 +SOURCES += $$PWD/qsql_db2.cpp | |
| 438 + | |
| 439 +unix { | |
| 440 + !contains(LIBS, .*db2.*):LIBS *= -ldb2 | |
| 441 +} else:!win32-borland { | |
| 442 + !contains(LIBS, .*db2.*):LIBS *= -ldb2cli | |
| 443 +} | |
| 444 diff --git a/src/sql/drivers/drivers.pri b/src/sql/drivers/drivers.pri | |
| 445 index 05e7265..3af5525 100644 | |
| 446 --- a/src/sql/drivers/drivers.pri | |
| 447 +++ b/src/sql/drivers/drivers.pri | |
| 448 @@ -1,119 +1,11 @@ | |
| 449 -contains(sql-drivers, all ) { | |
| 450 - sql-driver += psql mysql odbc oci tds db2 sqlite ibase | |
| 451 -} | |
| 452 - | |
| 453 -contains(sql-drivers, psql) { | |
| 454 - HEADERS += drivers/psql/qsql_psql.h | |
| 455 - SOURCES += drivers/psql/qsql_psql.cpp | |
| 456 - | |
| 457 - unix|win32-g++* { | |
| 458 - !static:!isEmpty(QT_LFLAGS_PSQL) { | |
| 459 - !contains(QT_CONFIG, system-zlib): QT_LFLAGS_PSQL -= -lz | |
| 460 - !static:LIBS *= $$QT_LFLAGS_PSQL | |
| 461 - QMAKE_CXXFLAGS *= $$QT_CFLAGS_PSQL | |
| 462 - } | |
| 463 - !contains(LIBS, .*pq.*):LIBS *= -lpq | |
| 464 - } else:win32:!contains(LIBS, .*pq.* ) LIBS *= -llibpq -lws2_32 -ladvapi32 | |
| 465 -} | |
| 466 - | |
| 467 -contains(sql-drivers, mysql) { | |
| 468 - HEADERS += drivers/mysql/qsql_mysql.h | |
| 469 - SOURCES += drivers/mysql/qsql_mysql.cpp | |
| 470 - | |
| 471 - unix { | |
| 472 - isEmpty(QT_LFLAGS_MYSQL) { | |
| 473 - !contains(LIBS, .*mysqlclient.*):!contains(LIBS, .*mysqld.*) { | |
| 474 - use_libmysqlclient_r:LIBS *= -lmysqlclient_r | |
| 475 - else:LIBS *= -lmysqlclient | |
| 476 - } | |
| 477 - } else { | |
| 478 - LIBS *= $$QT_LFLAGS_MYSQL | |
| 479 - QMAKE_CXXFLAGS *= $$QT_CFLAGS_MYSQL | |
| 480 - } | |
| 481 - } | |
| 482 - | |
| 483 - win32:!contains(LIBS, .*mysql.*):!contains(LIBS, .*mysqld.*) { | |
| 484 - !win32-g++*:LIBS *= -llibmysql | |
| 485 - else:LIBS *= -lmysql | |
| 486 - } | |
| 487 -} | |
| 488 - | |
| 489 -contains(sql-drivers, odbc) { | |
| 490 - HEADERS += drivers/odbc/qsql_odbc.h | |
| 491 - SOURCES += drivers/odbc/qsql_odbc.cpp | |
| 492 - | |
| 493 - mac:!contains( LIBS, .*odbc.* ):LIBS *= -liodbc | |
| 494 - unix:!contains( LIBS, .*odbc.* ):LIBS *= -lodbc | |
| 495 - unix:DEFINES += UNICODE | |
| 496 - | |
| 497 - win32 { | |
| 498 - !win32-borland:LIBS *= -lodbc32 | |
| 499 - else:LIBS *= $(BCB)/lib/PSDK/odbc32.lib | |
| 500 - } | |
| 501 -} | |
| 502 - | |
| 503 -contains(sql-drivers, oci) { | |
| 504 - HEADERS += drivers/oci/qsql_oci.h | |
| 505 - SOURCES += drivers/oci/qsql_oci.cpp | |
| 506 - | |
| 507 - unix:!contains( LIBS, .*clnts.* ):LIBS += -lclntsh | |
| 508 - | |
| 509 - win32:LIBS += -loci | |
| 510 -} | |
| 511 - | |
| 512 -contains(sql-drivers, tds) { | |
| 513 - HEADERS += drivers/tds/qsql_tds.h | |
| 514 - SOURCES += drivers/tds/qsql_tds.cpp | |
| 515 - | |
| 516 - unix:LIBS += -L$SYBASE/lib -lsybdb | |
| 517 - | |
| 518 - win32 { | |
| 519 - !win32-borland:LIBS += -lNTWDBLIB | |
| 520 - else:LIBS += $(BCB)/lib/PSDK/NTWDBLIB.LIB | |
| 521 - } | |
| 522 -} | |
| 523 - | |
| 524 -contains(sql-drivers, db2) { | |
| 525 - HEADERS += drivers/db2/qsql_db2.h | |
| 526 - SOURCES += drivers/db2/qsql_db2.cpp | |
| 527 - | |
| 528 - unix:LIBS += -ldb2 | |
| 529 - | |
| 530 - win32 { | |
| 531 - !win32-borland:LIBS += -ldb2cli | |
| 532 -# else:LIBS += $(BCB)/lib/PSDK/db2cli.lib | |
| 533 - } | |
| 534 -} | |
| 535 - | |
| 536 -contains(sql-drivers, ibase) { | |
| 537 - HEADERS += drivers/ibase/qsql_ibase.h | |
| 538 - SOURCES += drivers/ibase/qsql_ibase.cpp | |
| 539 - | |
| 540 - unix:LIBS *= -lgds | |
| 541 - | |
| 542 - win32 { | |
| 543 - !win32-borland:LIBS *= -lgds32_ms | |
| 544 - else:LIBS += gds32.lib | |
| 545 - } | |
| 546 -} | |
| 547 - | |
| 548 -contains(sql-drivers, sqlite2) { | |
| 549 - HEADERS += drivers/sqlite2/qsql_sqlite2.h | |
| 550 - SOURCES += drivers/sqlite2/qsql_sqlite2.cpp | |
| 551 - !contains(LIBS, .*sqlite.*):LIBS *= -lsqlite | |
| 552 -} | |
| 553 - | |
| 554 -contains(sql-drivers, sqlite) { | |
| 555 - !system-sqlite:!contains( LIBS, .*sqlite3.* ) { | |
| 556 - CONFIG(release, debug|release):DEFINES *= NDEBUG | |
| 557 - DEFINES += SQLITE_OMIT_LOAD_EXTENSION SQLITE_OMIT_COMPLETE | |
| 558 - INCLUDEPATH += ../3rdparty/sqlite | |
| 559 - SOURCES += ../3rdparty/sqlite/sqlite3.c | |
| 560 - } else { | |
| 561 - LIBS *= $$QT_LFLAGS_SQLITE | |
| 562 - QMAKE_CXXFLAGS *= $$QT_CFLAGS_SQLITE | |
|
1040
0cf0c907b475
improvements for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
1015
diff
changeset
|
563 - } |
|
0cf0c907b475
improvements for package qt
Mark Brand <mabrand@mabrand.nl>
parents:
1015
diff
changeset
|
564 - |
| 1097 | 565 - HEADERS += drivers/sqlite/qsql_sqlite.h |
| 566 - SOURCES += drivers/sqlite/qsql_sqlite.cpp | |
| 567 -} | |
| 568 +contains(sql-drivers, all):sql-driver += psql mysql odbc oci tds db2 sqlite ibase | |
| 569 + | |
| 570 +contains(sql-drivers, psql):include($$PWD/sqlite/qsql_psql.pri) | |
| 571 +contains(sql-drivers, mysql):include($$PWD/mysql/qsql_mysql.pri) | |
| 572 +contains(sql-drivers, odbc):include($$PWD/odbc/qsql_odbc.pri) | |
| 573 +contains(sql-drivers, oci):include($$PWD/oci/qsql_oci.pri) | |
| 574 +contains(sql-drivers, tds):include($$PWD/tds/qsql_tds.pri) | |
| 575 +contains(sql-drivers, db2):include($$PWD/db2/qsql_db2.pri) | |
| 576 +contains(sql-drivers, ibase):include($$PWD/db2/qsql_ibase.pri) | |
| 577 +contains(sql-drivers, sqlite2):include($$PWD/sqlite2/qsql_sqlite2.pri) | |
| 578 +contains(sql-drivers, sqlite):include($$PWD/sqlite/qsql_sqlite.pri) | |
| 579 diff --git a/src/sql/drivers/ibase/qsql_ibase.pri b/src/sql/drivers/ibase/qsql_ibase.pri | |
| 580 new file mode 100644 | |
| 581 index 0000000..ebcd18a | |
| 582 --- /dev/null | |
| 583 +++ b/src/sql/drivers/ibase/qsql_ibase.pri | |
| 584 @@ -0,0 +1,11 @@ | |
| 585 +HEADERS += $$PWD/qsql_ibase.h | |
| 586 +SOURCES += $$PWD/qsql_ibase.cpp | |
| 587 + | |
| 588 +unix { | |
| 589 + !contains(LIBS, .*gds.*):!contains(LIBS, .*libfb.*):LIBS *= -lgds | |
| 590 +} else { | |
| 591 + !contains(LIBS, .*gds.*):!contains(LIBS, .*fbclient.*) { | |
| 592 + win32-borland:LIBS += gds32.lib | |
| 593 + else:LIBS *= -lgds32_ms | |
| 594 + } | |
| 595 +} | |
| 596 diff --git a/src/sql/drivers/mysql/qsql_mysql.pri b/src/sql/drivers/mysql/qsql_mysql.pri | |
| 597 new file mode 100644 | |
| 598 index 0000000..801b891 | |
| 599 --- /dev/null | |
| 600 +++ b/src/sql/drivers/mysql/qsql_mysql.pri | |
| 601 @@ -0,0 +1,16 @@ | |
| 602 +HEADERS += $$PWD/qsql_mysql.h | |
| 603 +SOURCES += $$PWD/qsql_mysql.cpp | |
| 604 + | |
| 605 +unix { | |
| 606 + isEmpty(QT_LFLAGS_MYSQL) { | |
| 607 + !contains(LIBS, .*mysqlclient.*):!contains(LIBS, .*mysqld.*) { | |
| 608 + use_libmysqlclient_r:LIBS *= -lmysqlclient_r | |
| 609 + else:LIBS *= -lmysqlclient | |
| 610 + } | |
| 611 + } else { | |
| 612 + LIBS *= $$QT_LFLAGS_MYSQL | |
| 613 + QMAKE_CXXFLAGS *= $$QT_CFLAGS_MYSQL | |
| 614 + } | |
| 615 +} else { | |
| 616 + !contains(LIBS, .*mysql.*):!contains(LIBS, .*mysqld.*):LIBS *= -llibmysql | |
| 617 +} | |
| 618 diff --git a/src/sql/drivers/oci/qsql_oci.pri b/src/sql/drivers/oci/qsql_oci.pri | |
| 619 new file mode 100644 | |
| 620 index 0000000..6859156 | |
| 621 --- /dev/null | |
| 622 +++ b/src/sql/drivers/oci/qsql_oci.pri | |
| 623 @@ -0,0 +1,9 @@ | |
| 624 +HEADERS += $$PWD/qsql_oci.h | |
| 625 +SOURCES += $$PWD/qsql_oci.cpp | |
| 626 + | |
| 627 +unix { | |
| 628 + !contains(LIBS, .*clnts.*):LIBS *= -lclntsh | |
| 629 +} else { | |
| 630 + LIBS *= -loci | |
| 631 +} | |
| 632 +macx:QMAKE_LFLAGS += -Wl,-flat_namespace,-U,_environ | |
| 633 diff --git a/src/sql/drivers/odbc/qsql_odbc.pri b/src/sql/drivers/odbc/qsql_odbc.pri | |
| 634 new file mode 100644 | |
| 635 index 0000000..c4c92be | |
| 636 --- /dev/null | |
| 637 +++ b/src/sql/drivers/odbc/qsql_odbc.pri | |
| 638 @@ -0,0 +1,13 @@ | |
| 639 +HEADERS += $$PWD/qsql_odbc.h | |
| 640 +SOURCES += $$PWD/qsql_odbc.cpp | |
| 641 + | |
| 642 +mac { | |
| 643 + !contains(LIBS, .*odbc.*):LIBS *= -liodbc | |
| 644 +} else:unix { | |
| 645 + DEFINES += UNICODE | |
| 646 + !contains(LIBS, .*odbc.*):LIBS *= $$QT_LFLAGS_ODBC | |
| 647 +} else:win32-borland { | |
| 648 + LIBS *= $(BCB)/lib/PSDK/odbc32.lib | |
| 649 +} else { | |
| 650 + LIBS *= -lodbc32 | |
| 651 +} | |
| 652 diff --git a/src/sql/drivers/psql/qsql_psql.pri b/src/sql/drivers/psql/qsql_psql.pri | |
| 653 new file mode 100644 | |
| 654 index 0000000..c282d57 | |
| 655 --- /dev/null | |
| 656 +++ b/src/sql/drivers/psql/qsql_psql.pri | |
| 657 @@ -0,0 +1,13 @@ | |
| 658 +HEADERS += $$PWD/qsql_psql.h | |
| 659 +SOURCES += $$PWD/qsql_psql.cpp | |
| 660 + | |
| 661 +unix|win32-g++* { | |
| 662 + !static:!isEmpty(QT_LFLAGS_PSQL) { | |
| 663 + !contains(QT_CONFIG, system-zlib): QT_LFLAGS_PSQL -= -lz | |
| 664 + LIBS *= $$QT_LFLAGS_PSQL | |
| 665 + QMAKE_CXXFLAGS *= $$QT_CFLAGS_PSQL | |
| 666 + } | |
| 667 + !contains(LIBS, .*pq.*):LIBS *= -lpq | |
| 668 +} else { | |
| 669 + !contains(LIBS, .*pq.*):LIBS *= -llibpq -lws2_32 -ladvapi32 | |
| 670 +} | |
| 671 diff --git a/src/sql/drivers/sqlite/qsql_sqlite.pri b/src/sql/drivers/sqlite/qsql_sqlite.pri | |
| 672 new file mode 100644 | |
| 673 index 0000000..7ad5936 | |
| 674 --- /dev/null | |
| 675 +++ b/src/sql/drivers/sqlite/qsql_sqlite.pri | |
| 676 @@ -0,0 +1,9 @@ | |
| 677 +HEADERS += $$PWD/qsql_sqlite.h | |
| 678 +SOURCES += $$PWD/qsql_sqlite.cpp | |
| 679 + | |
| 680 +!system-sqlite:!contains(LIBS, .*sqlite3.*) { | |
| 681 + include($$PWD/../../../3rdparty/sqlite.pri) | |
| 682 +} else { | |
| 683 + LIBS *= $$QT_LFLAGS_SQLITE | |
| 684 + QMAKE_CXXFLAGS *= $$QT_CFLAGS_SQLITE | |
| 685 +} | |
| 686 diff --git a/src/sql/drivers/sqlite2/qsql_sqlite2.pri b/src/sql/drivers/sqlite2/qsql_sqlite2.pri | |
| 687 new file mode 100644 | |
| 688 index 0000000..9f0e807 | |
| 689 --- /dev/null | |
| 690 +++ b/src/sql/drivers/sqlite2/qsql_sqlite2.pri | |
| 691 @@ -0,0 +1,4 @@ | |
| 692 +HEADERS += $PWD/qsql_sqlite2.h | |
| 693 +SOURCES += $PWD/qsql_sqlite2.cpp | |
| 694 + | |
| 695 +!contains(LIBS, .*sqlite.*):LIBS *= -lsqlite | |
| 696 diff --git a/src/sql/drivers/tds/qsql_tds.pri b/src/sql/drivers/tds/qsql_tds.pri | |
| 697 new file mode 100644 | |
| 698 index 0000000..e2662ca | |
| 699 --- /dev/null | |
| 700 +++ b/src/sql/drivers/tds/qsql_tds.pri | |
| 701 @@ -0,0 +1,10 @@ | |
| 702 +HEADERS += $$PWD/qsql_tds.h | |
| 703 +SOURCES += $$PWD/qsql_tds.cpp | |
| 704 + | |
| 705 +unix { | |
| 706 + !contains(LIBS, .*sybdb.*):LIBS *= -lsybdb | |
| 707 +} else:win32-borland { | |
| 708 + LIBS *= $(BCB)/lib/PSDK/NTWDBLIB.LIB | |
| 709 +} else { | |
| 710 + LIBS *= -lNTWDBLIB | |
| 711 +} | |
| 712 | |
| 713 commit f32bbfe1b713dacac6ee9b4d6ebb4561a2ca92c3 | |
| 714 Author: Mark Brand <mabrand@mabrand.nl> | |
| 715 Date: Wed Jul 7 12:05:37 2010 +0200 | |
| 716 | |
| 717 Simplify *= to += after contains() test | |
| 718 | |
| 719 Merge-request: 715 | |
| 720 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | |
| 721 (cherry picked from commit 484c05ef374ef1c1043836b074693838d6b30adb) | |
| 722 | |
| 723 diff --git a/src/sql/drivers/db2/qsql_db2.pri b/src/sql/drivers/db2/qsql_db2.pri | |
| 724 index e53a8a0..16557f0 100644 | |
| 725 --- a/src/sql/drivers/db2/qsql_db2.pri | |
| 726 +++ b/src/sql/drivers/db2/qsql_db2.pri | |
| 727 @@ -2,7 +2,7 @@ HEADERS += $$PWD/qsql_db2.h | |
| 728 SOURCES += $$PWD/qsql_db2.cpp | |
|
1015
7997c04d4bef
upgrade package qt to 4.7.0-beta1 (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
1002
diff
changeset
|
729 |
| 1097 | 730 unix { |
| 731 - !contains(LIBS, .*db2.*):LIBS *= -ldb2 | |
| 732 + !contains(LIBS, .*db2.*):LIBS += -ldb2 | |
| 733 } else:!win32-borland { | |
| 734 - !contains(LIBS, .*db2.*):LIBS *= -ldb2cli | |
| 735 + !contains(LIBS, .*db2.*):LIBS += -ldb2cli | |
| 736 } | |
| 737 diff --git a/src/sql/drivers/ibase/qsql_ibase.pri b/src/sql/drivers/ibase/qsql_ibase.pri | |
| 738 index ebcd18a..33fbb0d 100644 | |
| 739 --- a/src/sql/drivers/ibase/qsql_ibase.pri | |
| 740 +++ b/src/sql/drivers/ibase/qsql_ibase.pri | |
| 741 @@ -2,10 +2,10 @@ HEADERS += $$PWD/qsql_ibase.h | |
| 742 SOURCES += $$PWD/qsql_ibase.cpp | |
| 743 | |
| 744 unix { | |
| 745 - !contains(LIBS, .*gds.*):!contains(LIBS, .*libfb.*):LIBS *= -lgds | |
| 746 + !contains(LIBS, .*gds.*):!contains(LIBS, .*libfb.*):LIBS += -lgds | |
| 747 } else { | |
| 748 !contains(LIBS, .*gds.*):!contains(LIBS, .*fbclient.*) { | |
| 749 win32-borland:LIBS += gds32.lib | |
| 750 - else:LIBS *= -lgds32_ms | |
| 751 + else:LIBS += -lgds32_ms | |
| 752 } | |
| 753 } | |
| 754 diff --git a/src/sql/drivers/mysql/qsql_mysql.pri b/src/sql/drivers/mysql/qsql_mysql.pri | |
| 755 index 801b891..1b9c3dd 100644 | |
| 756 --- a/src/sql/drivers/mysql/qsql_mysql.pri | |
| 757 +++ b/src/sql/drivers/mysql/qsql_mysql.pri | |
| 758 @@ -4,13 +4,13 @@ SOURCES += $$PWD/qsql_mysql.cpp | |
| 759 unix { | |
| 760 isEmpty(QT_LFLAGS_MYSQL) { | |
| 761 !contains(LIBS, .*mysqlclient.*):!contains(LIBS, .*mysqld.*) { | |
| 762 - use_libmysqlclient_r:LIBS *= -lmysqlclient_r | |
| 763 - else:LIBS *= -lmysqlclient | |
| 764 + use_libmysqlclient_r:LIBS += -lmysqlclient_r | |
| 765 + else:LIBS += -lmysqlclient | |
| 766 } | |
| 767 } else { | |
| 768 LIBS *= $$QT_LFLAGS_MYSQL | |
| 769 QMAKE_CXXFLAGS *= $$QT_CFLAGS_MYSQL | |
| 770 } | |
| 771 } else { | |
| 772 - !contains(LIBS, .*mysql.*):!contains(LIBS, .*mysqld.*):LIBS *= -llibmysql | |
| 773 + !contains(LIBS, .*mysql.*):!contains(LIBS, .*mysqld.*):LIBS += -llibmysql | |
| 774 } | |
| 775 diff --git a/src/sql/drivers/oci/qsql_oci.pri b/src/sql/drivers/oci/qsql_oci.pri | |
| 776 index 6859156..60ccc4c 100644 | |
| 777 --- a/src/sql/drivers/oci/qsql_oci.pri | |
| 778 +++ b/src/sql/drivers/oci/qsql_oci.pri | |
| 779 @@ -2,7 +2,7 @@ HEADERS += $$PWD/qsql_oci.h | |
| 780 SOURCES += $$PWD/qsql_oci.cpp | |
| 781 | |
| 782 unix { | |
| 783 - !contains(LIBS, .*clnts.*):LIBS *= -lclntsh | |
| 784 + !contains(LIBS, .*clnts.*):LIBS += -lclntsh | |
| 785 } else { | |
| 786 LIBS *= -loci | |
| 787 } | |
| 788 diff --git a/src/sql/drivers/odbc/qsql_odbc.pri b/src/sql/drivers/odbc/qsql_odbc.pri | |
| 789 index c4c92be..8394012 100644 | |
| 790 --- a/src/sql/drivers/odbc/qsql_odbc.pri | |
| 791 +++ b/src/sql/drivers/odbc/qsql_odbc.pri | |
| 792 @@ -2,10 +2,10 @@ HEADERS += $$PWD/qsql_odbc.h | |
| 793 SOURCES += $$PWD/qsql_odbc.cpp | |
|
972
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
794 |
| 1097 | 795 mac { |
| 796 - !contains(LIBS, .*odbc.*):LIBS *= -liodbc | |
| 797 + !contains(LIBS, .*odbc.*):LIBS += -liodbc | |
| 798 } else:unix { | |
| 799 DEFINES += UNICODE | |
| 800 - !contains(LIBS, .*odbc.*):LIBS *= $$QT_LFLAGS_ODBC | |
| 801 + !contains(LIBS, .*odbc.*):LIBS += $$QT_LFLAGS_ODBC | |
| 802 } else:win32-borland { | |
| 803 LIBS *= $(BCB)/lib/PSDK/odbc32.lib | |
| 804 } else { | |
| 805 diff --git a/src/sql/drivers/psql/qsql_psql.pri b/src/sql/drivers/psql/qsql_psql.pri | |
| 806 index c282d57..97db4be 100644 | |
| 807 --- a/src/sql/drivers/psql/qsql_psql.pri | |
| 808 +++ b/src/sql/drivers/psql/qsql_psql.pri | |
| 809 @@ -7,7 +7,7 @@ unix|win32-g++* { | |
| 810 LIBS *= $$QT_LFLAGS_PSQL | |
| 811 QMAKE_CXXFLAGS *= $$QT_CFLAGS_PSQL | |
| 812 } | |
| 813 - !contains(LIBS, .*pq.*):LIBS *= -lpq | |
| 814 + !contains(LIBS, .*pq.*):LIBS += -lpq | |
| 815 } else { | |
| 816 - !contains(LIBS, .*pq.*):LIBS *= -llibpq -lws2_32 -ladvapi32 | |
| 817 + !contains(LIBS, .*pq.*):LIBS += -llibpq -lws2_32 -ladvapi32 | |
| 818 } | |
| 819 diff --git a/src/sql/drivers/sqlite2/qsql_sqlite2.pri b/src/sql/drivers/sqlite2/qsql_sqlite2.pri | |
| 820 index 9f0e807..76fe255 100644 | |
| 821 --- a/src/sql/drivers/sqlite2/qsql_sqlite2.pri | |
| 822 +++ b/src/sql/drivers/sqlite2/qsql_sqlite2.pri | |
| 823 @@ -1,4 +1,4 @@ | |
| 824 HEADERS += $PWD/qsql_sqlite2.h | |
| 825 SOURCES += $PWD/qsql_sqlite2.cpp | |
| 826 | |
| 827 -!contains(LIBS, .*sqlite.*):LIBS *= -lsqlite | |
| 828 +!contains(LIBS, .*sqlite.*):LIBS += -lsqlite | |
| 829 diff --git a/src/sql/drivers/tds/qsql_tds.pri b/src/sql/drivers/tds/qsql_tds.pri | |
| 830 index e2662ca..c552ead 100644 | |
| 831 --- a/src/sql/drivers/tds/qsql_tds.pri | |
| 832 +++ b/src/sql/drivers/tds/qsql_tds.pri | |
| 833 @@ -2,7 +2,7 @@ HEADERS += $$PWD/qsql_tds.h | |
| 834 SOURCES += $$PWD/qsql_tds.cpp | |
| 835 | |
| 836 unix { | |
| 837 - !contains(LIBS, .*sybdb.*):LIBS *= -lsybdb | |
| 838 + !contains(LIBS, .*sybdb.*):LIBS += -lsybdb | |
| 839 } else:win32-borland { | |
| 840 LIBS *= $(BCB)/lib/PSDK/NTWDBLIB.LIB | |
| 841 } else { | |
| 842 | |
| 843 commit 72f49a70bb5a719e161aeceea986aac116c270d7 | |
| 844 Author: Mark Brand <mabrand@mabrand.nl> | |
| 845 Date: Thu Jul 8 15:28:24 2010 +0200 | |
| 846 | |
| 847 Corrected paths | |
| 848 | |
| 849 Merge-request: 715 | |
| 850 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | |
| 851 (cherry picked from commit c69dc51e5e03aaa87a9385f5557a4f6b8aaeded3) | |
| 852 | |
| 853 diff --git a/src/sql/drivers/drivers.pri b/src/sql/drivers/drivers.pri | |
| 854 index 3af5525..87cc0b1 100644 | |
| 855 --- a/src/sql/drivers/drivers.pri | |
| 856 +++ b/src/sql/drivers/drivers.pri | |
| 857 @@ -1,11 +1,11 @@ | |
| 858 contains(sql-drivers, all):sql-driver += psql mysql odbc oci tds db2 sqlite ibase | |
| 859 | |
| 860 -contains(sql-drivers, psql):include($$PWD/sqlite/qsql_psql.pri) | |
| 861 +contains(sql-drivers, psql):include($$PWD/psql/qsql_psql.pri) | |
| 862 contains(sql-drivers, mysql):include($$PWD/mysql/qsql_mysql.pri) | |
| 863 contains(sql-drivers, odbc):include($$PWD/odbc/qsql_odbc.pri) | |
| 864 contains(sql-drivers, oci):include($$PWD/oci/qsql_oci.pri) | |
| 865 contains(sql-drivers, tds):include($$PWD/tds/qsql_tds.pri) | |
| 866 contains(sql-drivers, db2):include($$PWD/db2/qsql_db2.pri) | |
| 867 -contains(sql-drivers, ibase):include($$PWD/db2/qsql_ibase.pri) | |
| 868 +contains(sql-drivers, ibase):include($$PWD/ibase/qsql_ibase.pri) | |
| 869 contains(sql-drivers, sqlite2):include($$PWD/sqlite2/qsql_sqlite2.pri) | |
| 870 contains(sql-drivers, sqlite):include($$PWD/sqlite/qsql_sqlite.pri) | |
| 871 | |
| 872 commit cc8386f6a7781ece721e9700ba2c290bb14c0d7d | |
| 873 Author: Mark Brand <mabrand@mabrand.nl> | |
| 874 Date: Thu Jul 29 11:15:00 2010 +0200 | |
| 875 | |
| 876 fixes for using freetds | |
| 877 | |
| 878 DBNTWIN32 only if not Q_USE_SYBASE. | |
| 879 Workaround for RETCODE typedef conflict between ODBC and FreeTDS. | |
| 880 Include winsock2.h supplies SOCKET for FreeTDS. | |
| 881 | |
| 882 Merge-request: 684 | |
| 883 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | |
| 884 (cherry picked from commit 3643d21756a6bd9ed06a409457d6e8c93aba3b43) | |
| 885 | |
| 886 diff --git a/src/sql/drivers/tds/qsql_tds.h b/src/sql/drivers/tds/qsql_tds.h | |
| 887 index f23a672..3594a4d 100644 | |
| 888 --- a/src/sql/drivers/tds/qsql_tds.h | |
| 889 +++ b/src/sql/drivers/tds/qsql_tds.h | |
| 890 @@ -48,7 +48,10 @@ | |
|
972
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
891 |
|
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
892 #ifdef Q_OS_WIN32 |
|
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
893 #define WIN32_LEAN_AND_MEAN |
| 1097 | 894 +#ifndef Q_USE_SYBASE |
| 895 #define DBNTWIN32 // indicates 32bit windows dblib | |
| 896 +#endif | |
|
972
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
897 +#include <winsock2.h> |
|
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
898 #include <QtCore/qt_windows.h> |
|
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
899 #include <sqlfront.h> |
|
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
900 #include <sqldb.h> |
| 1097 | 901 diff --git a/src/sql/kernel/qsqldatabase.cpp b/src/sql/kernel/qsqldatabase.cpp |
| 902 index 76bc2b0..2ab37de 100644 | |
| 903 --- a/src/sql/kernel/qsqldatabase.cpp | |
| 904 +++ b/src/sql/kernel/qsqldatabase.cpp | |
| 905 @@ -60,7 +60,10 @@ | |
| 906 #include "../drivers/oci/qsql_oci.h" | |
| 907 #endif | |
| 908 #ifdef QT_SQL_TDS | |
| 909 +// conflicting RETCODE typedef between odbc and freetds | |
| 910 +#define RETCODE DBRETCODE | |
| 911 #include "../drivers/tds/qsql_tds.h" | |
| 912 +#undef RETCODE | |
| 913 #endif | |
| 914 #ifdef QT_SQL_DB2 | |
| 915 #include "../drivers/db2/qsql_db2.h" | |
| 916 | |
| 917 commit 0da5d326ddf55bc47f8dfa13572405706d96029f | |
| 918 Author: Mark Brand <mabrand@mabrand.nl> | |
| 919 Date: Tue Aug 3 16:37:05 2010 +0200 | |
| 920 | |
| 921 Improve TDS configuration through QT_LFLAGS_TDS, SYBASE, SYBASE_LIBS | |
| 922 | |
| 923 Consistent with QT_LFLAGS_* for other database drivers. | |
| 924 Support added to configure shell script and configure.exe. | |
| 925 Respect SYBASE and SYBASE_LIBS. | |
| 926 Use QT_LFLAGS_TDS in project files. | |
| 927 | |
| 928 Merge-request: 2416 | |
| 929 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | |
| 930 (cherry picked from commit 2c7621730d30ac418874c18036a7aa34e2aae1d0) | |
| 931 | |
| 932 diff --git a/configure b/configure | |
| 933 index 05633fa..e6b9476 100755 | |
| 934 --- a/configure | |
| 935 +++ b/configure | |
| 936 @@ -818,6 +818,7 @@ QT_LFLAGS_MYSQL_R= | |
| 937 QT_CFLAGS_SQLITE= | |
| 938 QT_LFLAGS_SQLITE= | |
| 939 QT_LFLAGS_ODBC="-lodbc" | |
| 940 +QT_LFLAGS_TDS= | |
| 941 | |
| 942 # flags for libdbus-1 | |
| 943 QT_CFLAGS_DBUS= | |
| 944 @@ -4990,7 +4991,9 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do | |
| 945 ;; | |
| 946 tds) | |
| 947 if [ "$CFG_SQL_tds" != "no" ]; then | |
| 948 - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/tds "TDS" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then | |
| 949 + [ -z "$SYBASE" ] || QT_LFLAGS_TDS="-L$SYBASE/lib" | |
| 950 + [ -z "$SYBASE_LIBS" ] || QT_LFLAGS_TDS="$QT_LFLAGS_TDS $SYBASE_LIBS" | |
| 951 + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/tds "TDS" $QT_LFLAGS_TDS $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then | |
| 952 if [ "$CFG_SQL_tds" = "auto" ]; then | |
| 953 CFG_SQL_tds=plugin | |
| 954 fi | |
| 955 @@ -7786,6 +7789,9 @@ fi | |
| 956 if [ -n "$QT_LFLAGS_ODBC" ]; then | |
| 957 echo "QT_LFLAGS_ODBC = $QT_LFLAGS_ODBC" >> "$CACHEFILE.tmp" | |
| 958 fi | |
| 959 +if [ -n "$QT_LFLAGS_TDS" ]; then | |
| 960 + echo "QT_LFLAGS_TDS = $QT_LFLAGS_TDS" >> "$CACHEFILE.tmp" | |
| 961 +fi | |
| 962 | |
| 963 if [ "$QT_EDITION" != "QT_EDITION_OPENSOURCE" ]; then | |
| 964 echo "DEFINES *= QT_EDITION=QT_EDITION_DESKTOP" >> "$CACHEFILE.tmp" | |
| 965 diff --git a/src/sql/drivers/tds/qsql_tds.pri b/src/sql/drivers/tds/qsql_tds.pri | |
| 966 index c552ead..037f793 100644 | |
| 967 --- a/src/sql/drivers/tds/qsql_tds.pri | |
| 968 +++ b/src/sql/drivers/tds/qsql_tds.pri | |
| 969 @@ -1,8 +1,10 @@ | |
| 970 HEADERS += $$PWD/qsql_tds.h | |
| 971 SOURCES += $$PWD/qsql_tds.cpp | |
|
972
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
972 |
| 1097 | 973 -unix { |
| 974 +unix|win32-g++: { | |
| 975 + !isEmpty(QT_LFLAGS_TDS):!static:LIBS *= $$QT_LFLAGS_TDS | |
| 976 !contains(LIBS, .*sybdb.*):LIBS += -lsybdb | |
| 977 + QMAKE_CXXFLAGS *= $$QT_CFLAGS_TDS | |
| 978 } else:win32-borland { | |
| 979 LIBS *= $(BCB)/lib/PSDK/NTWDBLIB.LIB | |
| 980 } else { | |
| 981 diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp | |
| 982 index f7dac93..c7e6c16 100644 | |
| 983 --- a/tools/configure/configureapp.cpp | |
| 984 +++ b/tools/configure/configureapp.cpp | |
| 985 @@ -1029,6 +1029,10 @@ void Configure::parseCmdLine() | |
| 986 opensslLibs = configCmdLine.at(i); | |
| 987 } else if (configCmdLine.at(i).startsWith("PSQL_LIBS=")) { | |
| 988 psqlLibs = configCmdLine.at(i); | |
| 989 + } else if (configCmdLine.at(i).startsWith("SYBASE=")) { | |
| 990 + sybase = configCmdLine.at(i); | |
| 991 + } else if (configCmdLine.at(i).startsWith("SYBASE_LIBS=")) { | |
| 992 + sybaseLibs = configCmdLine.at(i); | |
| 993 } | |
|
1015
7997c04d4bef
upgrade package qt to 4.7.0-beta1 (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
1002
diff
changeset
|
994 |
| 1097 | 995 else if ((configCmdLine.at(i) == "-override-version") || (configCmdLine.at(i) == "-version-override")){ |
| 996 @@ -2747,6 +2751,17 @@ void Configure::generateOutputVars() | |
| 997 } | |
| 998 if (!psqlLibs.isEmpty()) | |
| 999 qmakeVars += QString("QT_LFLAGS_PSQL=") + psqlLibs.section("=", 1); | |
| 1000 + | |
| 1001 + { | |
| 1002 + QStringList lflagsTDS; | |
| 1003 + if (!sybase.isEmpty()) | |
| 1004 + lflagsTDS += QString("-L") + fixSeparators(sybase.section("=", 1) + "/lib"); | |
| 1005 + if (!sybaseLibs.isEmpty()) | |
| 1006 + lflagsTDS += sybaseLibs.section("=", 1); | |
| 1007 + if (!lflagsTDS.isEmpty()) | |
| 1008 + qmakeVars += QString("QT_LFLAGS_TDS=") + lflagsTDS.join(" "); | |
| 1009 + } | |
| 1010 + | |
| 1011 if (!qmakeSql.isEmpty()) | |
| 1012 qmakeVars += QString("sql-drivers += ") + qmakeSql.join(" "); | |
| 1013 if (!qmakeSqlPlugins.isEmpty()) | |
| 1014 diff --git a/tools/configure/configureapp.h b/tools/configure/configureapp.h | |
| 1015 index ff2ee8b..b3c07f7 100644 | |
| 1016 --- a/tools/configure/configureapp.h | |
| 1017 +++ b/tools/configure/configureapp.h | |
| 1018 @@ -134,6 +134,8 @@ private: | |
| 1019 QStringList qmakeLibs; | |
| 1020 QString opensslLibs; | |
| 1021 QString psqlLibs; | |
| 1022 + QString sybase; | |
| 1023 + QString sybaseLibs; | |
| 1024 | |
| 1025 QMap<QString,QString> licenseInfo; | |
| 1026 QString outputLine; | |
| 1027 | |
| 1028 commit 8479bf5654d117322fdb7264b82f7fa9303da9aa | |
| 1029 Author: Mark Brand <mabrand@mabrand.nl> | |
| 1030 Date: Tue Aug 24 14:28:42 2010 +0200 | |
| 1031 | |
| 1032 scope fixes and clutter reduction for sql driver projects | |
| 1033 | |
| 1034 Add missing wildcard to scope where meant to include all | |
| 1035 win32-g++ targets. | |
| 1036 | |
| 1037 There is no reason to ignore QT_LFLAGS_TDS and QT_LFLAGS_PSQL | |
| 1038 in static builds. Via LIBS these may end up in QMAKE_PRL_LIBS | |
| 1039 in QtSql.prl. Also, the isEmpty() tests on these is | |
| 1040 redundant and only wastes time. | |
| 1041 | |
| 1042 Processing of QT_CFLAGS_PSQL should not depend on QT_LFLAGS_PSQL. | |
| 1043 | |
| 1044 It no longer seems appropriate to clean up "-lz" here in | |
| 1045 case of zlib bundled in QtCore. It's reasonable to expect | |
| 1046 QT_LFLAGS_PSQL to be ready after configure. | |
| 1047 (cherry picked from commit f1ceaaf96bc658e04f83fd909ad93d1a4d0a2290) | |
| 1048 | |
| 1049 diff --git a/src/sql/drivers/psql/qsql_psql.pri b/src/sql/drivers/psql/qsql_psql.pri | |
| 1050 index 97db4be..6da3540 100644 | |
| 1051 --- a/src/sql/drivers/psql/qsql_psql.pri | |
| 1052 +++ b/src/sql/drivers/psql/qsql_psql.pri | |
| 1053 @@ -2,12 +2,9 @@ HEADERS += $$PWD/qsql_psql.h | |
| 1054 SOURCES += $$PWD/qsql_psql.cpp | |
| 1055 | |
| 1056 unix|win32-g++* { | |
| 1057 - !static:!isEmpty(QT_LFLAGS_PSQL) { | |
| 1058 - !contains(QT_CONFIG, system-zlib): QT_LFLAGS_PSQL -= -lz | |
| 1059 - LIBS *= $$QT_LFLAGS_PSQL | |
| 1060 - QMAKE_CXXFLAGS *= $$QT_CFLAGS_PSQL | |
| 1061 - } | |
| 1062 + LIBS *= $$QT_LFLAGS_PSQL | |
| 1063 !contains(LIBS, .*pq.*):LIBS += -lpq | |
| 1064 + QMAKE_CXXFLAGS *= $$QT_CFLAGS_PSQL | |
|
1015
7997c04d4bef
upgrade package qt to 4.7.0-beta1 (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
1002
diff
changeset
|
1065 } else { |
| 1097 | 1066 !contains(LIBS, .*pq.*):LIBS += -llibpq -lws2_32 -ladvapi32 |
|
1015
7997c04d4bef
upgrade package qt to 4.7.0-beta1 (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
1002
diff
changeset
|
1067 } |
| 1097 | 1068 diff --git a/src/sql/drivers/tds/qsql_tds.pri b/src/sql/drivers/tds/qsql_tds.pri |
| 1069 index 037f793..521c06b 100644 | |
| 1070 --- a/src/sql/drivers/tds/qsql_tds.pri | |
| 1071 +++ b/src/sql/drivers/tds/qsql_tds.pri | |
| 1072 @@ -1,8 +1,8 @@ | |
| 1073 HEADERS += $$PWD/qsql_tds.h | |
| 1074 SOURCES += $$PWD/qsql_tds.cpp | |
|
1015
7997c04d4bef
upgrade package qt to 4.7.0-beta1 (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
1002
diff
changeset
|
1075 |
| 1097 | 1076 -unix|win32-g++: { |
| 1077 - !isEmpty(QT_LFLAGS_TDS):!static:LIBS *= $$QT_LFLAGS_TDS | |
| 1078 +unix|win32-g++*: { | |
| 1079 + LIBS *= $$QT_LFLAGS_TDS | |
| 1080 !contains(LIBS, .*sybdb.*):LIBS += -lsybdb | |
| 1081 QMAKE_CXXFLAGS *= $$QT_CFLAGS_TDS | |
| 1082 } else:win32-borland { | |
| 1083 | |
|
1107
4dacc284e354
package qt: updated patch attributions
Mark Brand <mabrand@mabrand.nl>
parents:
1104
diff
changeset
|
1084 commit 6e4d951c781925dc24dedc905c63f7a7aa325d1d |
| 1097 | 1085 Author: Mark Brand <mabrand@mabrand.nl> |
|
1107
4dacc284e354
package qt: updated patch attributions
Mark Brand <mabrand@mabrand.nl>
parents:
1104
diff
changeset
|
1086 Date: Mon Aug 30 10:27:12 2010 +0200 |
| 1097 | 1087 |
|
1107
4dacc284e354
package qt: updated patch attributions
Mark Brand <mabrand@mabrand.nl>
parents:
1104
diff
changeset
|
1088 fix MinGW cross compilation with -debug-and-release |
|
1100
ef9fcd8df707
package qt: fix failure of -debug-and-release configure option
Mark Brand <mabrand@mabrand.nl>
parents:
1097
diff
changeset
|
1089 |
|
ef9fcd8df707
package qt: fix failure of -debug-and-release configure option
Mark Brand <mabrand@mabrand.nl>
parents:
1097
diff
changeset
|
1090 Fixed two issues in the configure script that prevented |
|
ef9fcd8df707
package qt: fix failure of -debug-and-release configure option
Mark Brand <mabrand@mabrand.nl>
parents:
1097
diff
changeset
|
1091 -debug-and-release from working correctly: |
|
ef9fcd8df707
package qt: fix failure of -debug-and-release configure option
Mark Brand <mabrand@mabrand.nl>
parents:
1097
diff
changeset
|
1092 |
|
ef9fcd8df707
package qt: fix failure of -debug-and-release configure option
Mark Brand <mabrand@mabrand.nl>
parents:
1097
diff
changeset
|
1093 We now allow dual debug and release mode for MinGW. |
|
ef9fcd8df707
package qt: fix failure of -debug-and-release configure option
Mark Brand <mabrand@mabrand.nl>
parents:
1097
diff
changeset
|
1094 |
|
ef9fcd8df707
package qt: fix failure of -debug-and-release configure option
Mark Brand <mabrand@mabrand.nl>
parents:
1097
diff
changeset
|
1095 We follow configure.exe in *not* settting PRECOMPILED_DIR. This gives |
|
ef9fcd8df707
package qt: fix failure of -debug-and-release configure option
Mark Brand <mabrand@mabrand.nl>
parents:
1097
diff
changeset
|
1096 qmake the freedom to put the debug and release precompiled headers in |
|
ef9fcd8df707
package qt: fix failure of -debug-and-release configure option
Mark Brand <mabrand@mabrand.nl>
parents:
1097
diff
changeset
|
1097 separate directories. |
|
1107
4dacc284e354
package qt: updated patch attributions
Mark Brand <mabrand@mabrand.nl>
parents:
1104
diff
changeset
|
1098 |
|
4dacc284e354
package qt: updated patch attributions
Mark Brand <mabrand@mabrand.nl>
parents:
1104
diff
changeset
|
1099 Merge-request: 794 |
|
4dacc284e354
package qt: updated patch attributions
Mark Brand <mabrand@mabrand.nl>
parents:
1104
diff
changeset
|
1100 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> |
|
4dacc284e354
package qt: updated patch attributions
Mark Brand <mabrand@mabrand.nl>
parents:
1104
diff
changeset
|
1101 (cherry picked from commit b4a7eadb28a49ace84994dcff665b1cabae69652) |
|
1100
ef9fcd8df707
package qt: fix failure of -debug-and-release configure option
Mark Brand <mabrand@mabrand.nl>
parents:
1097
diff
changeset
|
1102 |
|
ef9fcd8df707
package qt: fix failure of -debug-and-release configure option
Mark Brand <mabrand@mabrand.nl>
parents:
1097
diff
changeset
|
1103 diff --git a/configure b/configure |
|
ef9fcd8df707
package qt: fix failure of -debug-and-release configure option
Mark Brand <mabrand@mabrand.nl>
parents:
1097
diff
changeset
|
1104 index e6b9476..a0cff96 100755 |
|
ef9fcd8df707
package qt: fix failure of -debug-and-release configure option
Mark Brand <mabrand@mabrand.nl>
parents:
1097
diff
changeset
|
1105 --- a/configure |
|
ef9fcd8df707
package qt: fix failure of -debug-and-release configure option
Mark Brand <mabrand@mabrand.nl>
parents:
1097
diff
changeset
|
1106 +++ b/configure |
|
ef9fcd8df707
package qt: fix failure of -debug-and-release configure option
Mark Brand <mabrand@mabrand.nl>
parents:
1097
diff
changeset
|
1107 @@ -2275,7 +2275,7 @@ fi |
|
ef9fcd8df707
package qt: fix failure of -debug-and-release configure option
Mark Brand <mabrand@mabrand.nl>
parents:
1097
diff
changeset
|
1108 |
|
ef9fcd8df707
package qt: fix failure of -debug-and-release configure option
Mark Brand <mabrand@mabrand.nl>
parents:
1097
diff
changeset
|
1109 # detect build style |
|
ef9fcd8df707
package qt: fix failure of -debug-and-release configure option
Mark Brand <mabrand@mabrand.nl>
parents:
1097
diff
changeset
|
1110 if [ "$CFG_DEBUG" = "auto" ]; then |
|
ef9fcd8df707
package qt: fix failure of -debug-and-release configure option
Mark Brand <mabrand@mabrand.nl>
parents:
1097
diff
changeset
|
1111 - if [ "$PLATFORM_MAC" = "yes" ]; then |
|
ef9fcd8df707
package qt: fix failure of -debug-and-release configure option
Mark Brand <mabrand@mabrand.nl>
parents:
1097
diff
changeset
|
1112 + if [ "$PLATFORM_MAC" = "yes" -o "$XPLATFORM_MINGW" = "yes" ]; then |
|
ef9fcd8df707
package qt: fix failure of -debug-and-release configure option
Mark Brand <mabrand@mabrand.nl>
parents:
1097
diff
changeset
|
1113 CFG_DEBUG_RELEASE=yes |
|
ef9fcd8df707
package qt: fix failure of -debug-and-release configure option
Mark Brand <mabrand@mabrand.nl>
parents:
1097
diff
changeset
|
1114 CFG_DEBUG=yes |
|
ef9fcd8df707
package qt: fix failure of -debug-and-release configure option
Mark Brand <mabrand@mabrand.nl>
parents:
1097
diff
changeset
|
1115 elif [ "$CFG_DEV" = "yes" ]; then |
|
ef9fcd8df707
package qt: fix failure of -debug-and-release configure option
Mark Brand <mabrand@mabrand.nl>
parents:
1097
diff
changeset
|
1116 @@ -6536,7 +6536,11 @@ if [ "$PLATFORM_QWS" = "yes" ]; then |
|
ef9fcd8df707
package qt: fix failure of -debug-and-release configure option
Mark Brand <mabrand@mabrand.nl>
parents:
1097
diff
changeset
|
1117 QT_CONFIG="$QT_CONFIG embedded" |
|
ef9fcd8df707
package qt: fix failure of -debug-and-release configure option
Mark Brand <mabrand@mabrand.nl>
parents:
1097
diff
changeset
|
1118 rm -f "src/.moc/$QMAKE_OUTDIR/allmoc.cpp" # needs remaking if config changes |
|
ef9fcd8df707
package qt: fix failure of -debug-and-release configure option
Mark Brand <mabrand@mabrand.nl>
parents:
1097
diff
changeset
|
1119 fi |
|
ef9fcd8df707
package qt: fix failure of -debug-and-release configure option
Mark Brand <mabrand@mabrand.nl>
parents:
1097
diff
changeset
|
1120 -QMakeVar set PRECOMPILED_DIR ".pch/$QMAKE_OUTDIR" |
|
ef9fcd8df707
package qt: fix failure of -debug-and-release configure option
Mark Brand <mabrand@mabrand.nl>
parents:
1097
diff
changeset
|
1121 +if [ "$XPLATFORM_MINGW" != "yes" ]; then |
|
ef9fcd8df707
package qt: fix failure of -debug-and-release configure option
Mark Brand <mabrand@mabrand.nl>
parents:
1097
diff
changeset
|
1122 + # Do not set this here for Windows. Let qmake do it so |
|
ef9fcd8df707
package qt: fix failure of -debug-and-release configure option
Mark Brand <mabrand@mabrand.nl>
parents:
1097
diff
changeset
|
1123 + # debug and release precompiled headers are kept separate. |
|
ef9fcd8df707
package qt: fix failure of -debug-and-release configure option
Mark Brand <mabrand@mabrand.nl>
parents:
1097
diff
changeset
|
1124 + QMakeVar set PRECOMPILED_DIR ".pch/$QMAKE_OUTDIR" |
|
ef9fcd8df707
package qt: fix failure of -debug-and-release configure option
Mark Brand <mabrand@mabrand.nl>
parents:
1097
diff
changeset
|
1125 +fi |
|
ef9fcd8df707
package qt: fix failure of -debug-and-release configure option
Mark Brand <mabrand@mabrand.nl>
parents:
1097
diff
changeset
|
1126 QMakeVar set OBJECTS_DIR ".obj/$QMAKE_OUTDIR" |
|
ef9fcd8df707
package qt: fix failure of -debug-and-release configure option
Mark Brand <mabrand@mabrand.nl>
parents:
1097
diff
changeset
|
1127 QMakeVar set MOC_DIR ".moc/$QMAKE_OUTDIR" |
|
ef9fcd8df707
package qt: fix failure of -debug-and-release configure option
Mark Brand <mabrand@mabrand.nl>
parents:
1097
diff
changeset
|
1128 QMakeVar set RCC_DIR ".rcc/$QMAKE_OUTDIR" |
|
1104
3cd158b49847
package qt: fix for using svg plugin
Mark Brand <mabrand@mabrand.nl>
parents:
1100
diff
changeset
|
1129 |
|
1107
4dacc284e354
package qt: updated patch attributions
Mark Brand <mabrand@mabrand.nl>
parents:
1104
diff
changeset
|
1130 commit 6556a798f2803298a6884c53a9a15738015a00a4 |
|
1104
3cd158b49847
package qt: fix for using svg plugin
Mark Brand <mabrand@mabrand.nl>
parents:
1100
diff
changeset
|
1131 Author: Mark Brand <mabrand@mabrand.nl> |
|
1107
4dacc284e354
package qt: updated patch attributions
Mark Brand <mabrand@mabrand.nl>
parents:
1104
diff
changeset
|
1132 Date: Mon Aug 30 15:25:54 2010 +0200 |
|
1104
3cd158b49847
package qt: fix for using svg plugin
Mark Brand <mabrand@mabrand.nl>
parents:
1100
diff
changeset
|
1133 |
|
1107
4dacc284e354
package qt: updated patch attributions
Mark Brand <mabrand@mabrand.nl>
parents:
1104
diff
changeset
|
1134 Fix static build on Windows with MinGW. |
|
1104
3cd158b49847
package qt: fix for using svg plugin
Mark Brand <mabrand@mabrand.nl>
parents:
1100
diff
changeset
|
1135 |
|
3cd158b49847
package qt: fix for using svg plugin
Mark Brand <mabrand@mabrand.nl>
parents:
1100
diff
changeset
|
1136 Q_DECL_IMPORT is still __declspec(dllimport), which is unsuitable for |
|
1107
4dacc284e354
package qt: updated patch attributions
Mark Brand <mabrand@mabrand.nl>
parents:
1104
diff
changeset
|
1137 static code. |
|
4dacc284e354
package qt: updated patch attributions
Mark Brand <mabrand@mabrand.nl>
parents:
1104
diff
changeset
|
1138 |
|
4dacc284e354
package qt: updated patch attributions
Mark Brand <mabrand@mabrand.nl>
parents:
1104
diff
changeset
|
1139 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com> |
|
4dacc284e354
package qt: updated patch attributions
Mark Brand <mabrand@mabrand.nl>
parents:
1104
diff
changeset
|
1140 (cherry picked from commit edbc656bfa5069dd40f64ae3123d6370c2d86538) |
|
1104
3cd158b49847
package qt: fix for using svg plugin
Mark Brand <mabrand@mabrand.nl>
parents:
1100
diff
changeset
|
1141 |
|
3cd158b49847
package qt: fix for using svg plugin
Mark Brand <mabrand@mabrand.nl>
parents:
1100
diff
changeset
|
1142 diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp |
|
3cd158b49847
package qt: fix for using svg plugin
Mark Brand <mabrand@mabrand.nl>
parents:
1100
diff
changeset
|
1143 index d545440..bf19a88 100644 |
|
3cd158b49847
package qt: fix for using svg plugin
Mark Brand <mabrand@mabrand.nl>
parents:
1100
diff
changeset
|
1144 --- a/src/svg/qsvghandler.cpp |
|
3cd158b49847
package qt: fix for using svg plugin
Mark Brand <mabrand@mabrand.nl>
parents:
1100
diff
changeset
|
1145 +++ b/src/svg/qsvghandler.cpp |
|
3cd158b49847
package qt: fix for using svg plugin
Mark Brand <mabrand@mabrand.nl>
parents:
1100
diff
changeset
|
1146 @@ -74,7 +74,7 @@ QT_BEGIN_NAMESPACE |
|
3cd158b49847
package qt: fix for using svg plugin
Mark Brand <mabrand@mabrand.nl>
parents:
1100
diff
changeset
|
1147 static const char *qt_inherit_text = "inherit"; |
|
3cd158b49847
package qt: fix for using svg plugin
Mark Brand <mabrand@mabrand.nl>
parents:
1100
diff
changeset
|
1148 #define QT_INHERIT QLatin1String(qt_inherit_text) |
|
3cd158b49847
package qt: fix for using svg plugin
Mark Brand <mabrand@mabrand.nl>
parents:
1100
diff
changeset
|
1149 |
|
3cd158b49847
package qt: fix for using svg plugin
Mark Brand <mabrand@mabrand.nl>
parents:
1100
diff
changeset
|
1150 -Q_DECL_IMPORT double qstrtod(const char *s00, char const **se, bool *ok); |
|
3cd158b49847
package qt: fix for using svg plugin
Mark Brand <mabrand@mabrand.nl>
parents:
1100
diff
changeset
|
1151 +Q_CORE_EXPORT double qstrtod(const char *s00, char const **se, bool *ok); |
|
3cd158b49847
package qt: fix for using svg plugin
Mark Brand <mabrand@mabrand.nl>
parents:
1100
diff
changeset
|
1152 |
|
3cd158b49847
package qt: fix for using svg plugin
Mark Brand <mabrand@mabrand.nl>
parents:
1100
diff
changeset
|
1153 // ======== duplicated from qcolor_p |
|
3cd158b49847
package qt: fix for using svg plugin
Mark Brand <mabrand@mabrand.nl>
parents:
1100
diff
changeset
|
1154 |
|
1107
4dacc284e354
package qt: updated patch attributions
Mark Brand <mabrand@mabrand.nl>
parents:
1104
diff
changeset
|
1155 |
|
4dacc284e354
package qt: updated patch attributions
Mark Brand <mabrand@mabrand.nl>
parents:
1104
diff
changeset
|
1156 commit d8e44aea381dbdaa789f2dbb051cd8fc44ce0b31 |
|
4dacc284e354
package qt: updated patch attributions
Mark Brand <mabrand@mabrand.nl>
parents:
1104
diff
changeset
|
1157 Author: Mark Brand <mabrand@mabrand.nl> |
|
4dacc284e354
package qt: updated patch attributions
Mark Brand <mabrand@mabrand.nl>
parents:
1104
diff
changeset
|
1158 Date: Sat Jun 5 23:41:04 2010 +0200 |
|
4dacc284e354
package qt: updated patch attributions
Mark Brand <mabrand@mabrand.nl>
parents:
1104
diff
changeset
|
1159 |
|
4dacc284e354
package qt: updated patch attributions
Mark Brand <mabrand@mabrand.nl>
parents:
1104
diff
changeset
|
1160 added missing INSTALLS to JavaScriptCore.pro for static libjscore |
|
4dacc284e354
package qt: updated patch attributions
Mark Brand <mabrand@mabrand.nl>
parents:
1104
diff
changeset
|
1161 |
|
4dacc284e354
package qt: updated patch attributions
Mark Brand <mabrand@mabrand.nl>
parents:
1104
diff
changeset
|
1162 For static build of Qt on win32-g++*, applications using webkit |
|
4dacc284e354
package qt: updated patch attributions
Mark Brand <mabrand@mabrand.nl>
parents:
1104
diff
changeset
|
1163 link to libjscore.a. |
|
4dacc284e354
package qt: updated patch attributions
Mark Brand <mabrand@mabrand.nl>
parents:
1104
diff
changeset
|
1164 |
|
4dacc284e354
package qt: updated patch attributions
Mark Brand <mabrand@mabrand.nl>
parents:
1104
diff
changeset
|
1165 diff --git a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro |
|
4dacc284e354
package qt: updated patch attributions
Mark Brand <mabrand@mabrand.nl>
parents:
1104
diff
changeset
|
1166 index 3f1ac86..602cb8d 100644 |
|
4dacc284e354
package qt: updated patch attributions
Mark Brand <mabrand@mabrand.nl>
parents:
1104
diff
changeset
|
1167 --- a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro |
|
4dacc284e354
package qt: updated patch attributions
Mark Brand <mabrand@mabrand.nl>
parents:
1104
diff
changeset
|
1168 +++ b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro |
|
4dacc284e354
package qt: updated patch attributions
Mark Brand <mabrand@mabrand.nl>
parents:
1104
diff
changeset
|
1169 @@ -14,6 +14,12 @@ QT -= gui |
|
4dacc284e354
package qt: updated patch attributions
Mark Brand <mabrand@mabrand.nl>
parents:
1104
diff
changeset
|
1170 |
|
4dacc284e354
package qt: updated patch attributions
Mark Brand <mabrand@mabrand.nl>
parents:
1104
diff
changeset
|
1171 CONFIG += depend_includepath |
|
4dacc284e354
package qt: updated patch attributions
Mark Brand <mabrand@mabrand.nl>
parents:
1104
diff
changeset
|
1172 |
|
4dacc284e354
package qt: updated patch attributions
Mark Brand <mabrand@mabrand.nl>
parents:
1104
diff
changeset
|
1173 +static:win32-g++* { |
|
4dacc284e354
package qt: updated patch attributions
Mark Brand <mabrand@mabrand.nl>
parents:
1104
diff
changeset
|
1174 + # applications must link to static libjscore |
|
4dacc284e354
package qt: updated patch attributions
Mark Brand <mabrand@mabrand.nl>
parents:
1104
diff
changeset
|
1175 + target.path = $$[QT_INSTALL_LIBS] |
|
4dacc284e354
package qt: updated patch attributions
Mark Brand <mabrand@mabrand.nl>
parents:
1104
diff
changeset
|
1176 + INSTALLS += target |
|
4dacc284e354
package qt: updated patch attributions
Mark Brand <mabrand@mabrand.nl>
parents:
1104
diff
changeset
|
1177 +} |
|
4dacc284e354
package qt: updated patch attributions
Mark Brand <mabrand@mabrand.nl>
parents:
1104
diff
changeset
|
1178 + |
|
4dacc284e354
package qt: updated patch attributions
Mark Brand <mabrand@mabrand.nl>
parents:
1104
diff
changeset
|
1179 contains(QT_CONFIG, embedded):CONFIG += embedded |
|
4dacc284e354
package qt: updated patch attributions
Mark Brand <mabrand@mabrand.nl>
parents:
1104
diff
changeset
|
1180 |
|
4dacc284e354
package qt: updated patch attributions
Mark Brand <mabrand@mabrand.nl>
parents:
1104
diff
changeset
|
1181 CONFIG(QTDIR_build) { |