diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-02-09 16:46:55 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-02-10 23:36:51 +0100 |
commit | 08c201070817be73c17fa7e4e790ba08e94532c6 (patch) | |
tree | ec9ccc67673d7a4e9712ba6a42764c2b0d3ace3e /src/plugins/sqldrivers | |
parent | e3ecabad228369bfc6dc82085446d7acc05ef45a (diff) |
src: Remove remains of qmake conversion from CMakeLists.txt files
Pick-to: 6.5
Change-Id: Id644d322a602038403bb7f46c532744575fbf6d3
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Diffstat (limited to 'src/plugins/sqldrivers')
-rw-r--r-- | src/plugins/sqldrivers/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/plugins/sqldrivers/db2/CMakeLists.txt | 5 | ||||
-rw-r--r-- | src/plugins/sqldrivers/mysql/CMakeLists.txt | 5 | ||||
-rw-r--r-- | src/plugins/sqldrivers/oci/CMakeLists.txt | 5 | ||||
-rw-r--r-- | src/plugins/sqldrivers/odbc/CMakeLists.txt | 7 | ||||
-rw-r--r-- | src/plugins/sqldrivers/psql/CMakeLists.txt | 7 | ||||
-rw-r--r-- | src/plugins/sqldrivers/sqlite/CMakeLists.txt | 8 |
7 files changed, 2 insertions, 39 deletions
diff --git a/src/plugins/sqldrivers/CMakeLists.txt b/src/plugins/sqldrivers/CMakeLists.txt index 932e501c48..40f8b168ba 100644 --- a/src/plugins/sqldrivers/CMakeLists.txt +++ b/src/plugins/sqldrivers/CMakeLists.txt @@ -1,9 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from sqldrivers.pro. - -# special case begin cmake_minimum_required(VERSION 3.16) if (NOT CMAKE_PROJECT_NAME STREQUAL "QtBase" AND NOT CMAKE_PROJECT_NAME STREQUAL "Qt") include(.cmake.conf) @@ -70,4 +67,3 @@ endif() if(NOT CMAKE_PROJECT_NAME STREQUAL "QtBase" AND NOT CMAKE_PROJECT_NAME STREQUAL "Qt") qt_print_feature_summary() endif() -# special case end diff --git a/src/plugins/sqldrivers/db2/CMakeLists.txt b/src/plugins/sqldrivers/db2/CMakeLists.txt index 4f5680799f..119a5b53c9 100644 --- a/src/plugins/sqldrivers/db2/CMakeLists.txt +++ b/src/plugins/sqldrivers/db2/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from db2.pro. - ##################################################################### ## QDB2DriverPlugin Plugin: ##################################################################### @@ -23,9 +21,6 @@ qt_internal_add_plugin(QDB2DriverPlugin Qt::SqlPrivate ) -#### Keys ignored in scope 1:.:.:db2.pro:<TRUE>: -# OTHER_FILES = "db2.json" - ## Scopes: ##################################################################### diff --git a/src/plugins/sqldrivers/mysql/CMakeLists.txt b/src/plugins/sqldrivers/mysql/CMakeLists.txt index 4a65847be7..fb28abd91a 100644 --- a/src/plugins/sqldrivers/mysql/CMakeLists.txt +++ b/src/plugins/sqldrivers/mysql/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from mysql.pro. - ##################################################################### ## QMYSQLDriverPlugin Plugin: ##################################################################### @@ -23,7 +21,4 @@ qt_internal_add_plugin(QMYSQLDriverPlugin Qt::SqlPrivate ) -#### Keys ignored in scope 1:.:.:mysql.pro:<TRUE>: -# OTHER_FILES = "mysql.json" - qt_internal_force_macos_intel_arch(QMYSQLDriverPlugin) diff --git a/src/plugins/sqldrivers/oci/CMakeLists.txt b/src/plugins/sqldrivers/oci/CMakeLists.txt index eb0597e434..66c4219905 100644 --- a/src/plugins/sqldrivers/oci/CMakeLists.txt +++ b/src/plugins/sqldrivers/oci/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from oci.pro. - ##################################################################### ## QOCIDriverPlugin Plugin: ##################################################################### @@ -23,9 +21,6 @@ qt_internal_add_plugin(QOCIDriverPlugin Qt::SqlPrivate ) -#### Keys ignored in scope 1:.:.:oci.pro:<TRUE>: -# OTHER_FILES = "oci.json" - ## Scopes: ##################################################################### diff --git a/src/plugins/sqldrivers/odbc/CMakeLists.txt b/src/plugins/sqldrivers/odbc/CMakeLists.txt index 2b56a4fca6..df091f9687 100644 --- a/src/plugins/sqldrivers/odbc/CMakeLists.txt +++ b/src/plugins/sqldrivers/odbc/CMakeLists.txt @@ -1,13 +1,11 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from odbc.pro. - ##################################################################### ## QODBCDriverPlugin Plugin: ##################################################################### -qt_find_package(ODBC) # special case +qt_find_package(ODBC) qt_internal_add_plugin(QODBCDriverPlugin OUTPUT_NAME qsqlodbc @@ -25,9 +23,6 @@ qt_internal_add_plugin(QODBCDriverPlugin Qt::SqlPrivate ) -#### Keys ignored in scope 1:.:.:odbc.pro:<TRUE>: -# OTHER_FILES = "odbc.json" - ## Scopes: ##################################################################### diff --git a/src/plugins/sqldrivers/psql/CMakeLists.txt b/src/plugins/sqldrivers/psql/CMakeLists.txt index 269fe3367d..d392f4dfa5 100644 --- a/src/plugins/sqldrivers/psql/CMakeLists.txt +++ b/src/plugins/sqldrivers/psql/CMakeLists.txt @@ -1,9 +1,7 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from psql.pro. - -qt_find_package(PostgreSQL) # special case +qt_find_package(PostgreSQL) ##################################################################### ## QPSQLDriverPlugin Plugin: @@ -25,9 +23,6 @@ qt_internal_add_plugin(QPSQLDriverPlugin Qt::SqlPrivate ) -#### Keys ignored in scope 1:.:.:psql.pro:<TRUE>: -# OTHER_FILES = "psql.json" - # PostgreSQL delivers header files that are not a part of PostgreSQL itself. When precompiled # headers are processed, MinGW uses 'pthread.h' from the PostgreSQL installation directory. # As result, we disable precompile headers for the plugin. diff --git a/src/plugins/sqldrivers/sqlite/CMakeLists.txt b/src/plugins/sqldrivers/sqlite/CMakeLists.txt index a183ecc965..add9dff9fd 100644 --- a/src/plugins/sqldrivers/sqlite/CMakeLists.txt +++ b/src/plugins/sqldrivers/sqlite/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from sqlite.pro. - ##################################################################### ## QSQLiteDriverPlugin Plugin: ##################################################################### @@ -22,10 +20,6 @@ qt_internal_add_plugin(QSQLiteDriverPlugin Qt::SqlPrivate ) -#### Keys ignored in scope 1:.:.:sqlite.pro:<TRUE>: -# OTHER_FILES = "sqlite.json" -# QT_FOR_CONFIG = "sqldrivers-private" - ## Scopes: ##################################################################### @@ -34,7 +28,6 @@ qt_internal_extend_target(QSQLiteDriverPlugin CONDITION QT_FEATURE_system_sqlite SQLite::SQLite3 ) -# special case begin if (NOT QT_FEATURE_system_sqlite) # On newer compilers compiling sqlite.c produces warnings qt_disable_warnings(QSQLiteDriverPlugin) @@ -43,7 +36,6 @@ endif() if(QT_FEATURE_system_sqlite) qt_internal_force_macos_intel_arch(QSQLiteDriverPlugin) endif() -# special case end qt_internal_extend_target(QSQLiteDriverPlugin CONDITION NOT QT_FEATURE_system_sqlite SOURCES |