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 Change-Id: I83d5bcc0939b698209481793f60a0199aa95a06e Reviewed-by: Dennis Oberst <dennis.oberst@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit edcb8e901b9353eacaefc5ba646800125edafb51) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
parent
14a2bd7adb
commit
70eab2cfd2
@ -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>
|
||||
|
Loading…
x
Reference in New Issue
Block a user