diff options
Diffstat (limited to 'src/plugins/sqldrivers/sqlite')
-rw-r--r-- | src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt | 93 | ||||
-rw-r--r-- | src/plugins/sqldrivers/sqlite/CMakeLists.txt | 34 | ||||
-rw-r--r-- | src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp | 9 |
3 files changed, 128 insertions, 8 deletions
diff --git a/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt b/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt new file mode 100644 index 0000000000..d258c23821 --- /dev/null +++ b/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt @@ -0,0 +1,93 @@ +# Generated from sqlite.pro. + +##################################################################### +## QSQLiteDriverPlugin Plugin: +##################################################################### + +qt_add_plugin(QSQLiteDriverPlugin + OUTPUT_NAME qsqlite + TYPE sqldrivers + SOURCES + qsql_sqlite.cpp qsql_sqlite_p.h + smain.cpp + DEFINES + QT_NO_CAST_FROM_ASCII + QT_NO_CAST_TO_ASCII + PUBLIC_LIBRARIES + Qt::Core + Qt::CorePrivate + Qt::SqlPrivate +) + +#### Keys ignored in scope 1:.:.:sqlite.pro:<TRUE>: +# OTHER_FILES = "sqlite.json" +# QT_FOR_CONFIG = "sqldrivers-private" + +## Scopes: +##################################################################### + +qt_extend_target(QSQLiteDriverPlugin CONDITION QT_FEATURE_system_sqlite + PUBLIC_LIBRARIES + sqlite +) + +qt_extend_target(QSQLiteDriverPlugin CONDITION NOT QT_FEATURE_system_sqlite + SOURCES + ../../../3rdparty/sqlite/sqlite3.c + DEFINES + SQLITE_ENABLE_COLUMN_METADATA + SQLITE_ENABLE_FTS3 + SQLITE_ENABLE_FTS3_PARENTHESIS + SQLITE_ENABLE_FTS5 + SQLITE_ENABLE_JSON1 + SQLITE_ENABLE_RTREE + SQLITE_OMIT_COMPLETE + INCLUDE_DIRECTORIES + ../../../3rdparty/sqlite +) + +qt_extend_target(QSQLiteDriverPlugin CONDITION CMAKE_BUILD_TYPE STREQUAL Release AND NOT QT_FEATURE_system_sqlite + DEFINES + NDEBUG +) + +qt_extend_target(QSQLiteDriverPlugin CONDITION NOT CONFIG___contains___largefile AND NOT QT_FEATURE_system_sqlite + DEFINES + SQLITE_DISABLE_LFS +) + +qt_extend_target(QSQLiteDriverPlugin CONDITION QT_FEATURE_posix_fallocate AND NOT QT_FEATURE_system_sqlite + DEFINES + HAVE_POSIX_FALLOCATE=1 +) + +qt_extend_target(QSQLiteDriverPlugin CONDITION WINRT AND NOT QT_FEATURE_system_sqlite + DEFINES + SQLITE_OS_WINRT +) + +#### Keys ignored in scope 8:.:../../../3rdparty:../../../3rdparty/sqlite.pri:WINRT: +# QMAKE_CFLAGS = "-Gy" + +qt_extend_target(QSQLiteDriverPlugin CONDITION QNX AND NOT QT_FEATURE_system_sqlite + DEFINES + _QNX_SOURCE +) + +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(QSQLiteDriverPlugin CONDITION QT_FEATURE_dlopen AND NOT QT_FEATURE_system_sqlite + PUBLIC_LIBRARIES + ${CMAKE_DL_LIBS} +) + +qt_extend_target(QSQLiteDriverPlugin 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" diff --git a/src/plugins/sqldrivers/sqlite/CMakeLists.txt b/src/plugins/sqldrivers/sqlite/CMakeLists.txt new file mode 100644 index 0000000000..d1453638b3 --- /dev/null +++ b/src/plugins/sqldrivers/sqlite/CMakeLists.txt @@ -0,0 +1,34 @@ +# Generated from sqlite.pro. + +##################################################################### +## QSQLiteDriverPlugin Plugin: +##################################################################### + +qt_add_plugin(QSQLiteDriverPlugin + OUTPUT_NAME qsqlite + TYPE sqldrivers + SOURCES + qsql_sqlite.cpp qsql_sqlite_p.h + smain.cpp + DEFINES + QT_NO_CAST_FROM_ASCII + QT_NO_CAST_TO_ASCII + LIBRARIES # special case + SQLite::SQLite3 # special case + PUBLIC_LIBRARIES + Qt::Core + Qt::CorePrivate + Qt::SqlPrivate +) + +#### Keys ignored in scope 1:.:.:sqlite.pro:<TRUE>: +# OTHER_FILES = "sqlite.json" +# QT_FOR_CONFIG = "sqldrivers-private" + +## Scopes: +##################################################################### + +# special case begin +# Remove non-system-sqlite code +# qt_extend_target(qsqlite CONDITION QT_FEATURE_system_sqlite +# special case end diff --git a/src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp b/src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp index 5eb9e7d2f8..27e7d02472 100644 --- a/src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp +++ b/src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp @@ -1034,15 +1034,8 @@ QStringList QSQLiteDriver::subscribedToNotifications() const void QSQLiteDriver::handleNotification(const QString &tableName, qint64 rowid) { Q_D(const QSQLiteDriver); - if (d->notificationid.contains(tableName)) { -#if QT_DEPRECATED_SINCE(5, 15) -QT_WARNING_PUSH -QT_WARNING_DISABLE_DEPRECATED - emit notification(tableName); -QT_WARNING_POP -#endif + if (d->notificationid.contains(tableName)) emit notification(tableName, QSqlDriver::UnknownSource, QVariant(rowid)); - } } QT_END_NAMESPACE |