diff options
| author | Martin Smith <martin.smith@qt.io> | 2018-01-03 14:19:03 +0100 |
|---|---|---|
| committer | Martin Smith <martin.smith@qt.io> | 2018-01-06 00:26:15 +0000 |
| commit | dd3f7c5f2bb86be9a0781168e1de6bcc937a740a (patch) | |
| tree | c9962f8e3f939dc283bb789e0bd5c069c59ac524 | |
| parent | 66a0fecfaeb85f5c7fe49e55289ec758aadc9eff (diff) | |
doc: Correct remaining qdoc warnings in qchar.h and qchar.cpp
Several enum values had to be given \value statements, and a
member function only visible for Windows had to become visible
to clang-qdoc.
Change-Id: I47fbbcf9c5e4333abd13a041ce8fee2c13f9541d
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| -rw-r--r-- | src/corelib/tools/qchar.cpp | 12 | ||||
| -rw-r--r-- | src/corelib/tools/qchar.h | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/src/corelib/tools/qchar.cpp b/src/corelib/tools/qchar.cpp index 5c887f47cd..31ea84a74e 100644 --- a/src/corelib/tools/qchar.cpp +++ b/src/corelib/tools/qchar.cpp @@ -186,6 +186,8 @@ QT_BEGIN_NAMESPACE \value Unicode_6_3 Version 6.3 Since Qt 5.3 \value Unicode_7_0 Version 7.0 Since Qt 5.5 \value Unicode_8_0 Version 8.0 Since Qt 5.6 + \value Unicode_9_0 Version 9.0 Since Qt 5.11 + \value Unicode_10_0 Version 10.0 Since Qt 5.11 \value Unicode_Unassigned The value is not assigned to any character in version 8.0 of Unicode. @@ -414,6 +416,16 @@ QT_BEGIN_NAMESPACE \value Script_Multani \value Script_OldHungarian \value Script_SignWriting + \value Script_Adlam + \value Script_Bhaiksuki + \value Script_Marchen + \value Script_Newa + \value Script_Osage + \value Script_Tangut + \value Script_MasaramGondi + \value Script_Nushu + \value Script_Soyombo + \value Script_ZanabazarSquare \omitvalue ScriptCount diff --git a/src/corelib/tools/qchar.h b/src/corelib/tools/qchar.h index 7a2d095fd0..a0c82dba05 100644 --- a/src/corelib/tools/qchar.h +++ b/src/corelib/tools/qchar.h @@ -89,7 +89,7 @@ public: #if defined(Q_COMPILER_UNICODE_STRINGS) Q_DECL_CONSTEXPR QChar(char16_t ch) Q_DECL_NOTHROW : ucs(ushort(ch)) {} // implicit #endif -#if defined(Q_OS_WIN) +#if defined(Q_OS_WIN) || defined(Q_CLANG_QDOC) Q_STATIC_ASSERT(sizeof(wchar_t) == sizeof(ushort)); Q_DECL_CONSTEXPR QChar(wchar_t ch) Q_DECL_NOTHROW : ucs(ushort(ch)) {} // implicit #endif |