diff options
| author | Ivan Solovev <ivan.solovev@qt.io> | 2022-08-09 12:40:05 +0200 |
|---|---|---|
| committer | Ivan Solovev <ivan.solovev@qt.io> | 2022-08-10 22:38:24 +0200 |
| commit | 62859ccaa666909c2db8ac4d0a46fa0f5163153f (patch) | |
| tree | ed87a06ee0ec84892ab2f4b0aa321f68c4e961c6 /src | |
| parent | 7ba39fff8d9d6c8b6d7629c599dd57d14a379cec (diff) | |
QtSql: establish removed_api.cpp for upcoming QT_SQL_REMOVED_SINCE
Pick-to: 6.4
Change-Id: I6614ed13deee733e0cc53b3d8bb6514b2c000a9b
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/sql/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/sql/compat/removed_api.cpp | 24 |
2 files changed, 27 insertions, 0 deletions
diff --git a/src/sql/CMakeLists.txt b/src/sql/CMakeLists.txt index a8542f0b11..b76302655c 100644 --- a/src/sql/CMakeLists.txt +++ b/src/sql/CMakeLists.txt @@ -10,6 +10,7 @@ qt_internal_add_module(Sql PLUGIN_TYPES sqldrivers SOURCES + compat/removed_api.cpp kernel/qsqlcachedresult.cpp kernel/qsqlcachedresult_p.h kernel/qsqldatabase.cpp kernel/qsqldatabase.h kernel/qsqldriver.cpp kernel/qsqldriver.h kernel/qsqldriver_p.h @@ -32,6 +33,8 @@ qt_internal_add_module(Sql Qt::Core PRIVATE_MODULE_INTERFACE Qt::CorePrivate + NO_PCH_SOURCES + "compat/removed_api.cpp" PRECOMPILED_HEADER "../corelib/global/qt_pch.h" GENERATE_CPP_EXPORTS diff --git a/src/sql/compat/removed_api.cpp b/src/sql/compat/removed_api.cpp new file mode 100644 index 0000000000..1ada26407a --- /dev/null +++ b/src/sql/compat/removed_api.cpp @@ -0,0 +1,24 @@ +// Copyright (C) 2022 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only + +#define QT_SQL_BUILD_REMOVED_API + +#include "qtsqlglobal.h" + +QT_USE_NAMESPACE + +#if QT_SQL_REMOVED_SINCE(6, 4) + +// #include <qotherheader.h> +// // implement removed functions from qotherheader.h +// order sections alphabetically to reduce chances of merge conflicts + +#endif // QT_SQL_REMOVED_SINCE(6, 4) + +#if QT_SQL_REMOVED_SINCE(6, 5) + +// #include <qotherheader.h> +// // implement removed functions from qotherheader.h +// order sections alphabetically to reduce chances of merge conflicts + +#endif // QT_SQL_REMOVED_SINCE(6, 5) |