diff options
| author | Craig Scott <craig.scott@qt.io> | 2021-09-20 12:27:20 +1000 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-09-22 04:05:47 +0000 |
| commit | 1fa9b1bb74e85afe160c8c8898f78ddb107b783f (patch) | |
| tree | 83ac25435135421bc9a3b0a33ef2058cd3b2bb95 | |
| parent | 4929070c7285043045de1eeeeb10f5fc687d8078 (diff) | |
| download | qtdoc-1fa9b1bb74e85afe160c8c8898f78ddb107b783f.tar.gz | |
Update the docs now that qt_disable_unicode_defines() is documented
Task-number: QTBUG-95712
Change-Id: If014345d7723de7e4a31ee41a0fb5366deafda0d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
(cherry picked from commit 8283936969cefbd3a2f8124ac5011a312267090e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | doc/src/cmake/cmake-manual.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/cmake/cmake-manual.qdoc b/doc/src/cmake/cmake-manual.qdoc index 514b34b0..05518335 100644 --- a/doc/src/cmake/cmake-manual.qdoc +++ b/doc/src/cmake/cmake-manual.qdoc @@ -304,11 +304,11 @@ \section2 Unicode support in Windows - In Qt 6, the UNICODE AND _UNICODE compiler macros are set by default for targets that link + In Qt 6, the \c UNICODE and \c{_UNICODE} compiler definitions are set by default for targets that link against Qt modules. This is in line with the qmake behavior, but it is a change compared to the CMake API behavior in Qt 5. - Call qt_disable_unicode_defines() on the target to not set the macros. + Call \l{qt6_disable_unicode_defines}{qt_disable_unicode_defines()} on the target to not set the definitions. \snippet snippets/cmake/qt5_qt6_compatible.cmake disable_unicode_defines */ |