QLatin1StringView: put qstringfwd.h in control of Q_L1S_VIEW_IS_PRIMARY

Less duplication, matches what we do for q_no_char8_t namespaces, too. Amends 94addad. Pick-to: 6.5 Change-Id: I5d98babcb66d1196d3aed31c33289a1b11212a3d Reviewed-by: Ivan Solovev <[email protected]> (cherry picked from commit 2d2ee56) Reviewed-by: Qt Cherry-pick Bot <[email protected]> (cherry picked from commit 1f0dc76)
qt · Dec 14, 2024 · 595a557 · 595a557
1 parent bee793c
commit 595a557
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/corelib/text/qlatin1stringview.h b/src/corelib/text/qlatin1stringview.h
@@ -12,6 +12,7 @@
 #include <QtCore/qcontainerfwd.h>
 #include <QtCore/qnamespace.h>
 #include <QtCore/qtversionchecks.h>
+#include <QtCore/qstringfwd.h>
 #include <QtCore/qstringview.h>
 
 #if 0
@@ -24,8 +25,7 @@ QT_BEGIN_NAMESPACE
 
 class QString;
 
-#if QT_VERSION >= QT_VERSION_CHECK(7, 0, 0) || defined(QT_BOOTSTRAPPED) || defined(Q_QDOC)
-#    define Q_L1S_VIEW_IS_PRIMARY
+#ifdef Q_L1S_VIEW_IS_PRIMARY
 class QLatin1StringView
 #else
 class QLatin1String

diff --git a/src/corelib/text/qstringfwd.h b/src/corelib/text/qstringfwd.h
@@ -28,6 +28,7 @@ QT_END_NO_CHAR8_T_NAMESPACE
 class QByteArray;
 class QByteArrayView;
 #if QT_VERSION >= QT_VERSION_CHECK(7, 0, 0) || defined(QT_BOOTSTRAPPED) || defined(Q_QDOC)
+# define Q_L1S_VIEW_IS_PRIMARY
 class QLatin1StringView;
 using QLatin1String = QLatin1StringView;
 #else