summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvan Solovev <ivan.solovev@qt.io>2022-08-09 12:40:05 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-08-10 21:17:06 +0000
commita2334fd51099333a5f86ec3f57498d3f394d105e (patch)
tree72905222fb1b1f8c066a0d0949f19b5652988911
parentec9a8c1925799cd554111d30ff6d1a841a4e7de6 (diff)
QtSql: establish removed_api.cpp for upcoming QT_SQL_REMOVED_SINCEv6.4.0-beta3
Change-Id: I6614ed13deee733e0cc53b3d8bb6514b2c000a9b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Marc Mutz <marc.mutz@qt.io> (cherry picked from commit 62859ccaa666909c2db8ac4d0a46fa0f5163153f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/sql/CMakeLists.txt3
-rw-r--r--src/sql/compat/removed_api.cpp24
2 files changed, 27 insertions, 0 deletions
diff --git a/src/sql/CMakeLists.txt b/src/sql/CMakeLists.txt
index b979038f35..e5f28c0f49 100644
--- a/src/sql/CMakeLists.txt
+++ b/src/sql/CMakeLists.txt
@@ -7,6 +7,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
@@ -29,6 +30,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)