diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2024-02-13 11:32:07 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2024-02-23 17:28:14 +0000 |
| commit | d2c829af3efe66aa039369b70ac806f7185623a9 (patch) | |
| tree | c78af6bfe22d7238bb65f8d9ebedf7b949cdb5d5 | |
| parent | 0638f66267131254d543702132935a865c8ea835 (diff) | |
QMinimalFlatSet: prepare for moving it to QtCore
Change the header guard name and include the QtCore header, if it
exists, in lieu of defining our own version.
Pick back to current LTS in case we port QMinimalFlatSet-from-Core to
older branches, too. This change doesn't really carry risk: either it
compiles or it doesn't.
Amends ff8299524e3a4e8654b7ec6bdbfe734a67c04e11.
Pick-to: 6.5
Change-Id: Ibfc49d234731b3fc172fcdfa7107db0aa63b0ccb
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit 9df2d921628bca1def8993c75cddb5559fede60a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 3645895b2397b8399b536a569af620c9bd880ca6)
| -rw-r--r-- | src/quick/util/qminimalflatset_p.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/quick/util/qminimalflatset_p.h b/src/quick/util/qminimalflatset_p.h index a7aed41305..0a882205ef 100644 --- a/src/quick/util/qminimalflatset_p.h +++ b/src/quick/util/qminimalflatset_p.h @@ -1,8 +1,12 @@ // 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 -#ifndef QMINIMALFLATSET_P_H -#define QMINIMALFLATSET_P_H +#ifndef QTDECLARATIVE_QMINIMALFLATSET_P_H +#define QTDECLARATIVE_QMINIMALFLATSET_P_H + +#if __has_include(<QtCore/private/qminimalflatset_p.h>) +# include <QtCore/private/qminimalflatset_p.h> +#else // // W A R N I N G @@ -140,4 +144,6 @@ private: QT_END_NAMESPACE -#endif // QMINIMALFLATSET_P_H +#endif // !__has_include(<QtCore/private/qminimalflatset_p.h>) + +#endif // QTDECLARATIVE_QMINIMALFLATSET_P_H |