From 04f11f9935453a3db6bc5e5064a187fa25e85d90 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Fri, 8 Jan 2021 17:04:04 +0100 Subject: Remove .prev_CMakeLists.txt files Those serve no purpose anymore, now that the .pro files are gone. Task-number: QTBUG-88742 Change-Id: I39943327b8c9871785b58e9973e4e7602371793e Reviewed-by: Cristian Adam Reviewed-by: Edward Welbourne Reviewed-by: Kai Koehne --- src/plugins/sqldrivers/.prev_CMakeLists.txt | 16 ---- src/plugins/sqldrivers/odbc/.prev_CMakeLists.txt | 32 -------- src/plugins/sqldrivers/psql/.prev_CMakeLists.txt | 24 ------ src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt | 85 ---------------------- 4 files changed, 157 deletions(-) delete mode 100644 src/plugins/sqldrivers/.prev_CMakeLists.txt delete mode 100644 src/plugins/sqldrivers/odbc/.prev_CMakeLists.txt delete mode 100644 src/plugins/sqldrivers/psql/.prev_CMakeLists.txt delete mode 100644 src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt (limited to 'src/plugins/sqldrivers') diff --git a/src/plugins/sqldrivers/.prev_CMakeLists.txt b/src/plugins/sqldrivers/.prev_CMakeLists.txt deleted file mode 100644 index c613e352a0..0000000000 --- a/src/plugins/sqldrivers/.prev_CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -# Generated from sqldrivers.pro. - -cmake_minimum_required(VERSION 3.15.0) - -include(.cmake.conf) -project(ldrivers_FIXME - VERSION "${QT_REPO_MODULE_VERSION}" - DESCRIPTION "Qt ldrivers_FIXME Libraries" - HOMEPAGE_URL "https://qt.io/" - LANGUAGES CXX C -) - -find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core SET_ME_TO_SOMETHING_USEFUL) -find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS SET_ME_TO_SOMETHING_USEFUL) - -qt_build_repo() diff --git a/src/plugins/sqldrivers/odbc/.prev_CMakeLists.txt b/src/plugins/sqldrivers/odbc/.prev_CMakeLists.txt deleted file mode 100644 index 0411d271cc..0000000000 --- a/src/plugins/sqldrivers/odbc/.prev_CMakeLists.txt +++ /dev/null @@ -1,32 +0,0 @@ -# Generated from odbc.pro. - -##################################################################### -## QODBCDriverPlugin Plugin: -##################################################################### - -qt_internal_add_plugin(QODBCDriverPlugin - OUTPUT_NAME qsqlodbc - TYPE sqldrivers - SOURCES - main.cpp - qsql_odbc.cpp qsql_odbc_p.h - DEFINES - QT_NO_CAST_FROM_ASCII - QT_NO_CAST_TO_ASCII - PUBLIC_LIBRARIES - ODBC::ODBC - Qt::Core - Qt::CorePrivate - Qt::SqlPrivate -) - -#### Keys ignored in scope 1:.:.:odbc.pro:: -# OTHER_FILES = "odbc.json" - -## Scopes: -##################################################################### - -qt_internal_extend_target(QODBCDriverPlugin CONDITION UNIX - DEFINES - UNICODE -) diff --git a/src/plugins/sqldrivers/psql/.prev_CMakeLists.txt b/src/plugins/sqldrivers/psql/.prev_CMakeLists.txt deleted file mode 100644 index 569f34471d..0000000000 --- a/src/plugins/sqldrivers/psql/.prev_CMakeLists.txt +++ /dev/null @@ -1,24 +0,0 @@ -# Generated from psql.pro. - -##################################################################### -## QPSQLDriverPlugin Plugin: -##################################################################### - -qt_internal_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:: -# OTHER_FILES = "psql.json" diff --git a/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt b/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt deleted file mode 100644 index c34e2119f9..0000000000 --- a/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt +++ /dev/null @@ -1,85 +0,0 @@ -# Generated from sqlite.pro. - -##################################################################### -## QSQLiteDriverPlugin Plugin: -##################################################################### - -qt_internal_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:: -# OTHER_FILES = "sqlite.json" -# QT_FOR_CONFIG = "sqldrivers-private" - -## Scopes: -##################################################################### - -qt_internal_extend_target(QSQLiteDriverPlugin CONDITION QT_FEATURE_system_sqlite - PUBLIC_LIBRARIES - SQLite::SQLite3 -) - -qt_internal_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_internal_extend_target(QSQLiteDriverPlugin CONDITION CMAKE_BUILD_TYPE STREQUAL Release AND NOT QT_FEATURE_system_sqlite - DEFINES - NDEBUG -) - -qt_internal_extend_target(QSQLiteDriverPlugin CONDITION NOT QT_FEATURE_largefile AND NOT QT_FEATURE_system_sqlite - DEFINES - SQLITE_DISABLE_LFS -) - -qt_internal_extend_target(QSQLiteDriverPlugin CONDITION QT_FEATURE_posix_fallocate AND NOT QT_FEATURE_system_sqlite - DEFINES - HAVE_POSIX_FALLOCATE=1 -) - -qt_internal_extend_target(QSQLiteDriverPlugin CONDITION QNX AND NOT QT_FEATURE_system_sqlite - DEFINES - _QNX_SOURCE -) - -qt_internal_extend_target(QSQLiteDriverPlugin CONDITION UNIX AND NOT QT_FEATURE_system_sqlite - DEFINES - HAVE_USLEEP=1 -) - -qt_internal_extend_target(QSQLiteDriverPlugin CONDITION QT_FEATURE_dlopen AND NOT QT_FEATURE_system_sqlite - PUBLIC_LIBRARIES - ${CMAKE_DL_LIBS} -) - -qt_internal_extend_target(QSQLiteDriverPlugin CONDITION NOT QT_FEATURE_dlopen AND NOT QT_FEATURE_system_sqlite - DEFINES - SQLITE_OMIT_LOAD_EXTENSION -) - -#### Keys ignored in scope 12:.:../../../3rdparty:../../../3rdparty/sqlite.pri:INTEGRITY: -# QMAKE_CFLAGS = "-include" "qplatformdefs.h" -- cgit v1.2.3