diff options
| author | Mark Brand <[email protected]> | 2016-09-05 18:05:43 +0200 |
|---|---|---|
| committer | Mark Brand <[email protected]> | 2016-09-22 21:06:31 +0000 |
| commit | ced4d167a25b63afd293a59aed389ca6efce7951 (patch) | |
| tree | 73753fddd058cf1f278dabd9a552b5b6529179a6 | |
| parent | 690587e922f83b04163c4ade574371905d683d9b (diff) | |
fix -system-sqlite configure option
Although configuration seemed to work and the configure summary
indicated that the system sqlite library was being used, qtsql
was actually still built from bundled sqlite sources. The problem
was that system-sqlite was not reaching the context of sqlite.pro.
Change-Id: I24676a19f0fc895111844cd0fe6c7e80f33574de
Reviewed-by: Lars Knoll <[email protected]>
| -rw-r--r-- | src/plugins/sqldrivers/sqlite/sqlite.pro | 8 | ||||
| -rw-r--r-- | src/sql/configure.json | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/plugins/sqldrivers/sqlite/sqlite.pro b/src/plugins/sqldrivers/sqlite/sqlite.pro index bcdf7d36f32..1066bf7f51d 100644 --- a/src/plugins/sqldrivers/sqlite/sqlite.pro +++ b/src/plugins/sqldrivers/sqlite/sqlite.pro @@ -1,12 +1,14 @@ TARGET = qsqlite +QT_FOR_CONFIG += sql-private + HEADERS += $$PWD/qsql_sqlite_p.h SOURCES += $$PWD/qsql_sqlite.cpp $$PWD/smain.cpp -!system-sqlite { - include($$PWD/../../../3rdparty/sqlite.pri) -} else { +qtConfig(system-sqlite) { QMAKE_USE += sqlite +} else { + include($$PWD/../../../3rdparty/sqlite.pri) } OTHER_FILES += sqlite.json diff --git a/src/sql/configure.json b/src/sql/configure.json index d1dc1986567..5476d419ed1 100644 --- a/src/sql/configure.json +++ b/src/sql/configure.json @@ -170,7 +170,7 @@ "label": " Using system provided SQLite", "autoDetect": false, "condition": "features.sql-sqlite && libs.sqlite3", - "output": [ "publicQtConfig" ] + "output": [ "privateFeature" ] }, "sql-tds": { "label": "TDS (Sybase)", |