summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexey Edelev <[email protected]>2024-07-17 11:18:37 +0200
committerAlexey Edelev <[email protected]>2024-07-18 12:25:49 +0200
commitbba0150200e16e6e0a8926dac1f32b00b8b1493b (patch)
tree8d375b9b67437e8ce6b6bf3599b077b59bbe46c9
parent720ae32f79038a5db763a2371c0e8d25d32d93cf (diff)
Add the note about the runtime encoding in the QString-like classes and QT_NO_UTF8_SOURCE
Mention that QT_NO_UTF8_SOURCE has no effect on runtime encoding of QString-like classes. Amends 37e6159ab0c1456e8dc38f38f3b21643585c1273 Pick-to: 6.5 6.7 6.8 Task-number: QTBUG-126435 Change-Id: I3629b8af0e3eb7353c9268e23167dbef6802bb00 Reviewed-by: Thiago Macieira <[email protected]> Reviewed-by: Leena Miettinen <[email protected]>
-rw-r--r--src/corelib/doc/src/cmake/cmake-properties.qdoc5
-rw-r--r--src/corelib/doc/src/cmake/qt_allow_non_utf8_sources.qdoc5
2 files changed, 10 insertions, 0 deletions
diff --git a/src/corelib/doc/src/cmake/cmake-properties.qdoc b/src/corelib/doc/src/cmake/cmake-properties.qdoc
index f844fc3e701..ed4ed218481 100644
--- a/src/corelib/doc/src/cmake/cmake-properties.qdoc
+++ b/src/corelib/doc/src/cmake/cmake-properties.qdoc
@@ -508,6 +508,11 @@ this behavior on a per-target basis by setting the property to \c TRUE:
set_property(TARGET target_name PROPERTY QT_NO_UTF8_SOURCE TRUE)
\endcode
+\note This does not change the runtime behavior of classes like
+\l QString (its constructor from \c{const char *} requires properly encoded
+UTF-8 input). Use the \l QT_NO_CAST_FROM_ASCII and
+\c QT_RESTRICTED_CAST_FROM_ASCII macros to help identify such code.
+
\sa {qt6_disable_unicode_defines}{qt_disable_unicode_defines()}{qt6_allow_non_utf8_sources()}
*/
diff --git a/src/corelib/doc/src/cmake/qt_allow_non_utf8_sources.qdoc b/src/corelib/doc/src/cmake/qt_allow_non_utf8_sources.qdoc
index 6e972ba63a1..b8091d38033 100644
--- a/src/corelib/doc/src/cmake/qt_allow_non_utf8_sources.qdoc
+++ b/src/corelib/doc/src/cmake/qt_allow_non_utf8_sources.qdoc
@@ -30,6 +30,11 @@ is currently implemented for Visual Studio and Intel compilers. You can disable
this behavior on a per-target basis by calling \c{qt_allow_non_utf8_sources()}
and passing the target as the argument.
+\note This does not change the runtime behavior of classes like
+\l QString (its constructor from \c{const char *} requires properly encoded
+UTF-8 input). Use the \l QT_NO_CAST_FROM_ASCII and
+\c QT_RESTRICTED_CAST_FROM_ASCII macros to help identify such code.
+
\sa {qt6_disable_unicode_defines}{qt_disable_unicode_defines()}
{cmake-target-property-QT_NO_UTF8_SOURCE}
*/