diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-01-22 14:23:02 +0100 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-01-27 11:49:34 +0000 |
commit | b10d8eab047c387409716ae87422d2efffee3159 (patch) | |
tree | f5ce14f553e5b8de3b2ebda30965ce4f5df380d6 /src/plugins/sqldrivers/sqlite | |
parent | 604aa83ad910c3a17af33850312d3c61a59f558f (diff) |
Regenerate plugin projects to get new target names
And also to get the original output names (qmake's "TARGET"), so that
the plugin file names are as they were in Qt 5.
Change-Id: I96a060d1a81693652847857372bec334728cb549
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/plugins/sqldrivers/sqlite')
-rw-r--r-- | src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt | 26 | ||||
-rw-r--r-- | src/plugins/sqldrivers/sqlite/CMakeLists.txt | 6 |
2 files changed, 16 insertions, 16 deletions
diff --git a/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt b/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt index ae08f26cb9..6e17dfe302 100644 --- a/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt +++ b/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from sqlite.pro. ##################################################################### -## qsqlite Plugin: +## QSQLiteDriverPlugin Plugin: ##################################################################### -qt_add_plugin(qsqlite +qt_add_plugin(QSQLiteDriverPlugin + OUTPUT_NAME qsqlite TYPE sqldrivers - CLASS_NAME QSQLiteDriverPlugin SOURCES qsql_sqlite.cpp qsql_sqlite_p.h smain.cpp @@ -28,12 +28,12 @@ qt_add_plugin(qsqlite ## Scopes: ##################################################################### -qt_extend_target(qsqlite CONDITION QT_FEATURE_system_sqlite +qt_extend_target(QSQLiteDriverPlugin CONDITION QT_FEATURE_system_sqlite PUBLIC_LIBRARIES sqlite ) -qt_extend_target(qsqlite CONDITION NOT QT_FEATURE_system_sqlite +qt_extend_target(QSQLiteDriverPlugin CONDITION NOT QT_FEATURE_system_sqlite SOURCES ../../../3rdparty/sqlite/sqlite3.c DEFINES @@ -48,22 +48,22 @@ qt_extend_target(qsqlite CONDITION NOT QT_FEATURE_system_sqlite ../../../3rdparty/sqlite ) -qt_extend_target(qsqlite CONDITION CMAKE_BUILD_TYPE STREQUAL Release AND NOT QT_FEATURE_system_sqlite +qt_extend_target(QSQLiteDriverPlugin CONDITION CMAKE_BUILD_TYPE STREQUAL Release AND NOT QT_FEATURE_system_sqlite DEFINES NDEBUG ) -qt_extend_target(qsqlite CONDITION NOT CONFIG___contains___largefile AND NOT QT_FEATURE_system_sqlite +qt_extend_target(QSQLiteDriverPlugin CONDITION NOT CONFIG___contains___largefile AND NOT QT_FEATURE_system_sqlite DEFINES SQLITE_DISABLE_LFS ) -qt_extend_target(qsqlite CONDITION QT_FEATURE_posix_fallocate AND NOT QT_FEATURE_system_sqlite +qt_extend_target(QSQLiteDriverPlugin CONDITION QT_FEATURE_posix_fallocate AND NOT QT_FEATURE_system_sqlite DEFINES HAVE_POSIX_FALLOCATE=1 ) -qt_extend_target(qsqlite CONDITION WINRT AND NOT QT_FEATURE_system_sqlite +qt_extend_target(QSQLiteDriverPlugin CONDITION WINRT AND NOT QT_FEATURE_system_sqlite DEFINES SQLITE_OS_WINRT ) @@ -71,22 +71,22 @@ qt_extend_target(qsqlite CONDITION WINRT AND NOT QT_FEATURE_system_sqlite #### Keys ignored in scope 8:.:../../../3rdparty:../../../3rdparty/sqlite.pri:WINRT: # QMAKE_CFLAGS = "-Gy" -qt_extend_target(qsqlite CONDITION QNX AND NOT QT_FEATURE_system_sqlite +qt_extend_target(QSQLiteDriverPlugin CONDITION QNX AND NOT QT_FEATURE_system_sqlite DEFINES _QNX_SOURCE ) -qt_extend_target(qsqlite CONDITION UNIX AND NOT QT_FEATURE_system_sqlite AND NOT WINRT AND NOT winphone +qt_extend_target(QSQLiteDriverPlugin CONDITION UNIX AND NOT QT_FEATURE_system_sqlite AND NOT WINRT AND NOT winphone DEFINES HAVE_USLEEP=1 ) -qt_extend_target(qsqlite CONDITION QT_FEATURE_dlopen AND NOT QT_FEATURE_system_sqlite +qt_extend_target(QSQLiteDriverPlugin CONDITION QT_FEATURE_dlopen AND NOT QT_FEATURE_system_sqlite PUBLIC_LIBRARIES ${CMAKE_DL_LIBS} ) -qt_extend_target(qsqlite CONDITION NOT QT_FEATURE_dlopen AND NOT QT_FEATURE_system_sqlite +qt_extend_target(QSQLiteDriverPlugin CONDITION NOT QT_FEATURE_dlopen AND NOT QT_FEATURE_system_sqlite DEFINES SQLITE_OMIT_LOAD_EXTENSION ) diff --git a/src/plugins/sqldrivers/sqlite/CMakeLists.txt b/src/plugins/sqldrivers/sqlite/CMakeLists.txt index 35fe8e69de..98c94a426a 100644 --- a/src/plugins/sqldrivers/sqlite/CMakeLists.txt +++ b/src/plugins/sqldrivers/sqlite/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from sqlite.pro. ##################################################################### -## qsqlite Plugin: +## QSQLiteDriverPlugin Plugin: ##################################################################### -qt_add_plugin(qsqlite +qt_add_plugin(QSQLiteDriverPlugin + OUTPUT_NAME qsqlite TYPE sqldrivers - CLASS_NAME QSQLiteDriverPlugin SOURCES qsql_sqlite.cpp qsql_sqlite_p.h smain.cpp |