diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-10 16:50:25 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-14 08:49:24 +0000 |
commit | b6e75ff3eaccc4f0322c9735533a1f3435597eba (patch) | |
tree | e42f8adad0259624fa6f17713074265ebf16928d /src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt | |
parent | eba59bfd14d0ea29f36e80be81137d26cc67e23a (diff) |
Regenerate qtbase after wip/qt6 -> wip/cmake merge
Note that android builds will be broken after this merge and
regeneration, because we don't currently handle the minimum required
changes that were brought in with the Android multi ABI support
that comes from 5.14.
This will have to be addressed in a separate change.
For now the build on Android will fail while compiling due to incorrect
generation of LIB_SUFFIX with QT_ARCH.
Change-Id: Ia4a871f4b7ddd0da11caf5f34e10a599a97bb55d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot
Diffstat (limited to 'src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt')
-rw-r--r-- | src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt b/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt index d39b81cc7f..45cf01fb1e 100644 --- a/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt +++ b/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt @@ -86,5 +86,10 @@ extend_target(qsqlite CONDITION QT_FEATURE_dlopen AND NOT QT_FEATURE_system_sqli ${CMAKE_DL_LIBS} ) -#### Keys ignored in scope 12:.:../../../3rdparty:../../../3rdparty/sqlite.pri:INTEGRITY: +extend_target(qsqlite CONDITION NOT QT_FEATURE_dlopen AND NOT QT_FEATURE_system_sqlite + DEFINES + SQLITE_OMIT_LOAD_EXTENSION +) + +#### Keys ignored in scope 13:.:../../../3rdparty:../../../3rdparty/sqlite.pri:INTEGRITY: # QMAKE_CFLAGS = "-include" "qplatformdefs.h" |