diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-02-10 18:31:58 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-02-11 10:19:42 +0100 |
| commit | f1ae5ae726cf909e4ee943eae8e09f8aff74bb3e (patch) | |
| tree | 0035f377344b27ec20aa3e2d9b64eab4d971a42a /src/plugins/sqldrivers/odbc | |
| parent | 79da236e76752c1f940036dffffebb8d2a707d66 (diff) | |
| parent | 3af9d49bb78ac56bff57d1c3867853730f97a8e1 (diff) | |
Merge "Merge remote-tracking branch 'origin/wip/cmake' into dev"
Diffstat (limited to 'src/plugins/sqldrivers/odbc')
| -rw-r--r-- | src/plugins/sqldrivers/odbc/.prev_CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/plugins/sqldrivers/odbc/CMakeLists.txt | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/src/plugins/sqldrivers/odbc/.prev_CMakeLists.txt b/src/plugins/sqldrivers/odbc/.prev_CMakeLists.txt index 2452d50989..692d1fc294 100644 --- a/src/plugins/sqldrivers/odbc/.prev_CMakeLists.txt +++ b/src/plugins/sqldrivers/odbc/.prev_CMakeLists.txt @@ -13,13 +13,11 @@ qt_add_plugin(QODBCDriverPlugin DEFINES QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII - LIBRARIES - Qt::CorePrivate - Qt::SqlPrivate PUBLIC_LIBRARIES ODBC::ODBC Qt::Core - Qt::Sql + Qt::CorePrivate + Qt::SqlPrivate ) #### Keys ignored in scope 1:.:.:odbc.pro:<TRUE>: diff --git a/src/plugins/sqldrivers/odbc/CMakeLists.txt b/src/plugins/sqldrivers/odbc/CMakeLists.txt index 0e19306786..5c163181c5 100644 --- a/src/plugins/sqldrivers/odbc/CMakeLists.txt +++ b/src/plugins/sqldrivers/odbc/CMakeLists.txt @@ -14,13 +14,11 @@ qt_add_plugin(QODBCDriverPlugin DEFINES QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII - LIBRARIES - Qt::CorePrivate - Qt::SqlPrivate PUBLIC_LIBRARIES ODBC::ODBC Qt::Core - Qt::Sql + Qt::CorePrivate + Qt::SqlPrivate ) #### Keys ignored in scope 1:.:.:odbc.pro:<TRUE>: |