diff options
Diffstat (limited to 'src/plugins/sqldrivers/psql')
-rw-r--r-- | src/plugins/sqldrivers/psql/.prev_CMakeLists.txt | 24 | ||||
-rw-r--r-- | src/plugins/sqldrivers/psql/CMakeLists.txt | 29 | ||||
-rw-r--r-- | src/plugins/sqldrivers/psql/main.cpp | 2 | ||||
-rw-r--r-- | src/plugins/sqldrivers/psql/psql.json | 2 | ||||
-rw-r--r-- | src/plugins/sqldrivers/psql/qsql_psql.cpp | 6 |
5 files changed, 55 insertions, 8 deletions
diff --git a/src/plugins/sqldrivers/psql/.prev_CMakeLists.txt b/src/plugins/sqldrivers/psql/.prev_CMakeLists.txt new file mode 100644 index 0000000000..f3cec6d302 --- /dev/null +++ b/src/plugins/sqldrivers/psql/.prev_CMakeLists.txt @@ -0,0 +1,24 @@ +# Generated from psql.pro. + +##################################################################### +## QPSQLDriverPlugin Plugin: +##################################################################### + +qt_add_plugin(QPSQLDriverPlugin + OUTPUT_NAME qsqlpsql + TYPE sqldrivers + SOURCES + main.cpp + qsql_psql.cpp qsql_psql_p.h + DEFINES + QT_NO_CAST_FROM_ASCII + QT_NO_CAST_TO_ASCII + PUBLIC_LIBRARIES + PostgreSQL::PostgreSQL + Qt::Core + Qt::CorePrivate + Qt::SqlPrivate +) + +#### Keys ignored in scope 1:.:.:psql.pro:<TRUE>: +# OTHER_FILES = "psql.json" diff --git a/src/plugins/sqldrivers/psql/CMakeLists.txt b/src/plugins/sqldrivers/psql/CMakeLists.txt new file mode 100644 index 0000000000..03a2dc69c3 --- /dev/null +++ b/src/plugins/sqldrivers/psql/CMakeLists.txt @@ -0,0 +1,29 @@ +# Generated from psql.pro. + +# FIXME cmake FindPostgreSQL is more exhaustive than the check we have for libpq-fe.h +# it also checks for catalog/pg_type.h which is a more internal include, we should +# add a way to tell cmake FindPostgreSQL to optionally only look for the libpq-fe.h one +qt_find_package(PostgreSQL) # special case + +##################################################################### +## QPSQLDriverPlugin Plugin: +##################################################################### + +qt_add_plugin(QPSQLDriverPlugin + OUTPUT_NAME qsqlpsql + TYPE sqldrivers + SOURCES + main.cpp + qsql_psql.cpp qsql_psql_p.h + DEFINES + QT_NO_CAST_FROM_ASCII + QT_NO_CAST_TO_ASCII + PUBLIC_LIBRARIES + PostgreSQL::PostgreSQL + Qt::Core + Qt::CorePrivate + Qt::SqlPrivate +) + +#### Keys ignored in scope 1:.:.:psql.pro:<TRUE>: +# OTHER_FILES = "psql.json" diff --git a/src/plugins/sqldrivers/psql/main.cpp b/src/plugins/sqldrivers/psql/main.cpp index a0862a238a..c31e6f64b7 100644 --- a/src/plugins/sqldrivers/psql/main.cpp +++ b/src/plugins/sqldrivers/psql/main.cpp @@ -61,7 +61,7 @@ QPSQLDriverPlugin::QPSQLDriverPlugin() QSqlDriver* QPSQLDriverPlugin::create(const QString &name) { - if (name == QLatin1String("QPSQL") || name == QLatin1String("QPSQL7")) + if (name == QLatin1String("QPSQL")) return new QPSQLDriver; return nullptr; } diff --git a/src/plugins/sqldrivers/psql/psql.json b/src/plugins/sqldrivers/psql/psql.json index 1579b99160..07092a33e7 100644 --- a/src/plugins/sqldrivers/psql/psql.json +++ b/src/plugins/sqldrivers/psql/psql.json @@ -1,3 +1,3 @@ { - "Keys": [ "QPSQL7", "QPSQL" ] + "Keys": [ "QPSQL" ] } diff --git a/src/plugins/sqldrivers/psql/qsql_psql.cpp b/src/plugins/sqldrivers/psql/qsql_psql.cpp index 38bf355856..d2c57bcddc 100644 --- a/src/plugins/sqldrivers/psql/qsql_psql.cpp +++ b/src/plugins/sqldrivers/psql/qsql_psql.cpp @@ -1668,12 +1668,6 @@ void QPSQLDriver::_q_handleNotification(int) if (notify->extra) payload = d->isUtf8 ? QString::fromUtf8(notify->extra) : QString::fromLatin1(notify->extra); #endif -#if QT_DEPRECATED_SINCE(5, 15) -QT_WARNING_PUSH -QT_WARNING_DISABLE_DEPRECATED - emit notification(name); -QT_WARNING_POP -#endif QSqlDriver::NotificationSource source = (notify->be_pid == PQbackendPID(d->connection)) ? QSqlDriver::SelfSource : QSqlDriver::OtherSource; emit notification(name, source, payload); } |