1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QtSql: establish removed_api.cpp for upcoming QT_SQL_REMOVED_SINCE

Browse Source 
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>
This commit is contained in:
Ivan Solovev 2022-08-09 12:40:05 +02:00 committed by Qt Cherry-pick Bot
parent ec9a8c1925
commit a2334fd510
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/sql/CMakeLists.txt
View File

@ -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

24
src/sql/compat/removed_api.cpp Normal file
View File

@ -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)