diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2023-07-11 16:34:46 +0200 |
|---|---|---|
| committer | Dennis Oberst <dennis.oberst@qt.io> | 2023-08-03 18:36:41 +0200 |
| commit | 15ff5bafa0cdb21134c6c4660206c16d26960da8 (patch) | |
| tree | 2a3498569fe14129d91ca9ec23f5ff5ca1fc3970 /src/corelib/text/qstringconverter.h | |
| parent | 06397cc45f3418257f5988709b387a828775737b (diff) | |
Don't protect qstringbuilder.h indirect includes
It's a) not needed, because qstringbuilder.h simply just defines op%
and not op+ when these defines are not set and b) surprising for users
that they have to include <qstringbuilder.h> if they want to use op%
without also setting one of these defines. Finally, it just throws
readers of the code off the track for no good reason.
So, drop the external guards for qtringbuilder.h in qstring.h and
qstringconverter.h.
Task-number: QTBUG-114208
Pick-to: 6.6 6.5
Change-Id: I00b3e405d905d319437c32a7253b39de1625d096
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Dennis Oberst <dennis.oberst@qt.io>
Diffstat (limited to 'src/corelib/text/qstringconverter.h')
| -rw-r--r-- | src/corelib/text/qstringconverter.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/corelib/text/qstringconverter.h b/src/corelib/text/qstringconverter.h index 373c1ad1e9..e12516966a 100644 --- a/src/corelib/text/qstringconverter.h +++ b/src/corelib/text/qstringconverter.h @@ -13,9 +13,7 @@ #include <QtCore/qstringconverter_base.h> #include <QtCore/qstring.h> -#if defined(QT_USE_FAST_OPERATOR_PLUS) || defined(QT_USE_QSTRINGBUILDER) #include <QtCore/qstringbuilder.h> -#endif QT_BEGIN_NAMESPACE |