diff options
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qglobal.cpp | 14 | ||||
| -rw-r--r-- | src/corelib/global/qnamespace.qdoc | 5 |
2 files changed, 8 insertions, 11 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index 284e833f73..5687920c9b 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -1165,7 +1165,7 @@ bool qSharedBuild() Q_DECL_NOTHROW \value WV_10_0 Operating system version 10.0, corresponds to Windows 10, introduced in Qt 5.5 The following masks can be used for testing whether a Windows - version is MS-DOS-based, NT-based, or CE-based: + version is MS-DOS-based or NT-based: \value WV_DOS_based MS-DOS-based version of Windows \value WV_NT_based NT-based version of Windows @@ -1297,14 +1297,14 @@ bool qSharedBuild() Q_DECL_NOTHROW \relates <QtGlobal> Defined on all supported versions of Windows. That is, if - \l Q_OS_WIN32, \l Q_OS_WIN64 or \l Q_OS_WINRT is defined. + \l Q_OS_WIN32, \l Q_OS_WIN64, or \l Q_OS_WINRT is defined. */ /*! \macro Q_OS_WIN32 \relates <QtGlobal> - Defined on 32-bit and 64-bit versions of Windows (not on Windows CE). + Defined on 32-bit and 64-bit versions of Windows. */ /*! @@ -2563,11 +2563,11 @@ static QString unknownText() so applications can rely on the returned value as an identifier, except that new OS kernel types may be added over time. - On Windows, this function returns the type of Windows kernel, like "wince" - or "winnt". On Unix systems, it returns the same as the output of \c{uname + On Windows, this function returns the type of Windows kernel, like "winnt". + On Unix systems, it returns the same as the output of \c{uname -s} (lowercased). - Note that this function may return surprising values: it returns "linux" + \note This function may return surprising values: it returns "linux" for all operating systems running Linux (including Android), "qnx" for all operating systems running QNX, "freebsd" for Debian/kFreeBSD, and "darwin" for \macos and iOS. For information on the type @@ -2644,7 +2644,7 @@ QString QSysInfo::kernelVersion() "unknown" otherwise. \b{Windows note}: this function returns "winphone" for builds for Windows - Phone, "winrt" for WinRT builds and "windows" for normal desktop builds. + Phone, "winrt" for WinRT builds, and "windows" for normal desktop builds. For other Unix-type systems, this function usually returns "unknown". diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index bf55693e8a..d8df25dcc6 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -137,7 +137,7 @@ \value AA_DontUseNativeMenuBar All menubars created while this attribute is set to true won't be used as a native menubar (e.g, the menubar at - the top of the main screen on \macos or at the bottom in Windows CE). + the top of the main screen on \macos). \value AA_MacDontSwapCtrlAndMeta On \macos by default, Qt swaps the Control and Meta (Command) keys (i.e., whenever Control is pressed, Qt @@ -930,9 +930,6 @@ \value WA_InputMethodEnabled Enables input methods for Asian languages. Must be set when creating custom text editing widgets. - On Windows CE this flag can be used in addition to - QApplication::autoSipEnabled to automatically display the SIP when - entering a widget. \value WA_KeyboardFocusChange Set on a toplevel window when the users changes focus with the keyboard (tab, backtab, or shortcut). |