summaryrefslogtreecommitdiffstats
path: root/src/plugins/sqldrivers/odbc
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2019-10-07 18:06:51 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2019-10-08 13:26:02 +0000
commit6704ed450b5e6407c0fd8073317f176d6b0bb27e (patch)
tree7376b2a7f56d54496f43e49a7f995ede88aec07e /src/plugins/sqldrivers/odbc
parent319f81126bca183d99ee261cdec85fc0ab9c9078 (diff)
Regenerate sqldrivers plugins
Change-Id: I583b5936205495813cdb0f04fcdd2da3c7e2a3f4 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Qt CMake Build Bot
Diffstat (limited to 'src/plugins/sqldrivers/odbc')
-rw-r--r--src/plugins/sqldrivers/odbc/.prev_CMakeLists.txt34
-rw-r--r--src/plugins/sqldrivers/odbc/CMakeLists.txt16
2 files changed, 43 insertions, 7 deletions
diff --git a/src/plugins/sqldrivers/odbc/.prev_CMakeLists.txt b/src/plugins/sqldrivers/odbc/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..ac3297eaaf
--- /dev/null
+++ b/src/plugins/sqldrivers/odbc/.prev_CMakeLists.txt
@@ -0,0 +1,34 @@
+# Generated from odbc.pro.
+
+#####################################################################
+## qsqlodbc Plugin:
+#####################################################################
+
+add_qt_plugin(qsqlodbc
+ TYPE sqldrivers
+ CLASS_NAME QODBCDriverPlugin
+ SOURCES
+ main.cpp
+ qsql_odbc.cpp qsql_odbc_p.h
+ DEFINES
+ QT_NO_CAST_FROM_ASCII
+ QT_NO_CAST_TO_ASCII
+ LIBRARIES
+ Qt::CorePrivate
+ Qt::SqlPrivate
+ PUBLIC_LIBRARIES
+ ODBC::ODBC
+ Qt::Core
+ Qt::Sql
+)
+
+#### Keys ignored in scope 1:.:.:odbc.pro:<TRUE>:
+# OTHER_FILES = "odbc.json"
+
+## Scopes:
+#####################################################################
+
+extend_target(qsqlodbc CONDITION UNIX
+ DEFINES
+ UNICODE
+)
diff --git a/src/plugins/sqldrivers/odbc/CMakeLists.txt b/src/plugins/sqldrivers/odbc/CMakeLists.txt
index b6ea71be01..542d3b9727 100644
--- a/src/plugins/sqldrivers/odbc/CMakeLists.txt
+++ b/src/plugins/sqldrivers/odbc/CMakeLists.txt
@@ -1,9 +1,11 @@
-qt_find_package(ODBC) # special case
+# Generated from odbc.pro.
#####################################################################
## qsqlodbc Plugin:
#####################################################################
+qt_find_package(ODBC) # special case
+
add_qt_plugin(qsqlodbc
TYPE sqldrivers
CLASS_NAME QODBCDriverPlugin
@@ -11,19 +13,19 @@ add_qt_plugin(qsqlodbc
main.cpp
qsql_odbc.cpp qsql_odbc_p.h
DEFINES
- QT_NO_CAST_TO_ASCII
QT_NO_CAST_FROM_ASCII
+ QT_NO_CAST_TO_ASCII
LIBRARIES
- ODBC::ODBC
- Qt::Core
Qt::CorePrivate
Qt::SqlPrivate
+ PUBLIC_LIBRARIES
+ ODBC::ODBC
+ Qt::Core
+ Qt::Sql
)
-#### Keys ignored in scope 1:.:odbc.pro:<NONE>:
+#### Keys ignored in scope 1:.:.:odbc.pro:<TRUE>:
# OTHER_FILES = "odbc.json"
-# PLUGIN_CLASS_NAME = "QODBCDriverPlugin"
-# _LOADED = "qt_plugin"
## Scopes:
#####################################################################