diff options
| author | Marc Mutz <[email protected]> | 2023-07-11 16:55:51 +0200 |
|---|---|---|
| committer | Dennis Oberst <[email protected]> | 2023-08-04 16:56:58 +0200 |
| commit | edcb8e901b9353eacaefc5ba646800125edafb51 (patch) | |
| tree | 7dbe54bab1f2d7ce1e53277861be194ecc395495 | |
| parent | 674134f08df0aa2d5863f3844b58d62368261174 (diff) | |
Drag qstring.h out of the qstringbuilder.h guard
qstringbuilder.h needs qstring.h completely parsed. Without this
change, we won't be able to include qstringconverter.h even at the end
of qstring.h (needed for QTBUG-114208).
Picking back to 6.5 to reduce the diff with our LTS going forward.
Task-number: QTBUG-114208
Pick-to: 6.6 6.5
Change-Id: I83d5bcc0939b698209481793f60a0199aa95a06e
Reviewed-by: Dennis Oberst <[email protected]>
Reviewed-by: Thiago Macieira <[email protected]>
Reviewed-by: Qt CI Bot <[email protected]>
| -rw-r--r-- | src/corelib/text/qstringbuilder.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/text/qstringbuilder.h b/src/corelib/text/qstringbuilder.h index 53f8865edf1..291988697fb 100644 --- a/src/corelib/text/qstringbuilder.h +++ b/src/corelib/text/qstringbuilder.h @@ -1,6 +1,8 @@ // Copyright (C) 2020 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 +#include <QtCore/qstring.h> + #ifndef QSTRINGBUILDER_H #define QSTRINGBUILDER_H @@ -11,7 +13,6 @@ #pragma qt_sync_stop_processing #endif -#include <QtCore/qstring.h> #include <QtCore/qbytearray.h> #include <string.h> |