From c3bd28de8d3659fb9c5acc1528f1972ebd2c45ac Mon Sep 17 00:00:00 2001 From: Venugopal Shivashankar Date: Tue, 16 Aug 2016 15:05:29 +0200 Subject: Doc: Remove references to Windows CE in Qt SQL and Qt Namespace MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The platform is not supported since Qt 5.7. - Removed Windows CE-specific \notes in SQL drivers' documentation - Marked a couple of Windows CE-specific enum values using \omitvalue Task-number: QTBUG-55331 Change-Id: I35b44f9d31fde6f10013c043260db1b852c171e2 Reviewed-by: Topi Reiniö Reviewed-by: Leena Miettinen --- src/corelib/global/qnamespace.qdoc | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'src/corelib/global') diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index bc74acfcde..86c38839d2 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 @@ -925,9 +925,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). @@ -2221,11 +2218,9 @@ the bottom. This window hint is currently not implemented for \macos. - \value WindowOkButtonHint Adds an OK button to the window decoration of a dialog. - Only supported for Windows CE. + \omitvalue WindowOkButtonHint - \value WindowCancelButtonHint Adds a Cancel button to the window decoration of a dialog. - Only supported for Windows CE. + \omitvalue WindowCancelButtonHint \value WindowTransparentForInput Informs the window system that this window is used only for output (displaying something) and does not take input. -- cgit v1.2.3 From ca979a2f69a36712d2bf4d3e4b5b9009c1779a50 Mon Sep 17 00:00:00 2001 From: Venugopal Shivashankar Date: Tue, 16 Aug 2016 16:44:02 +0200 Subject: Doc: Remove references to Windows CE in Qt Core MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The platform is not supported since Qt 5.7 Task-number: QTBUG-55331 Change-Id: I98b90d574d9a76c4281852d93818620b5f489117 Reviewed-by: Topi Reiniö --- src/corelib/global/qglobal.cpp | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-) (limited to 'src/corelib/global') diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index 79ced22c0f..c14f774bd6 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -1147,19 +1147,17 @@ bool qSharedBuild() Q_DECL_NOTHROW \value WV_6_3 Operating system version 6.3, corresponds to Windows 8.1, introduced in Qt 5.2 \value WV_10_0 Operating system version 10.0, corresponds to Windows 10, introduced in Qt 5.5 - CE-based versions: - - \value WV_CE Windows CE - \value WV_CENET Windows CE .NET - \value WV_CE_5 Windows CE 5.x - \value WV_CE_6 Windows CE 6.x + \omitvalue WV_CE + \omitvalue WV_CENET + \omitvalue WV_CE_5 + \omitvalue WV_CE_6 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 - \value WV_CE_based CE-based version of Windows + \omitvalue WV_CE_based \value WV_None Operating system other than Windows. @@ -1282,14 +1280,14 @@ bool qSharedBuild() Q_DECL_NOTHROW \relates Defined on all supported versions of Windows. That is, if - \l Q_OS_WIN32, \l Q_OS_WIN64, \l Q_OS_WINCE 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 - Defined on 32-bit and 64-bit versions of Windows (not on Windows CE). + Defined on 32-bit and 64-bit versions of Windows. */ /*! @@ -1299,13 +1297,6 @@ bool qSharedBuild() Q_DECL_NOTHROW Defined on 64-bit versions of Windows. */ -/*! - \macro Q_OS_WINCE - \relates - - Defined on Windows CE. -*/ - /*! \macro Q_OS_WINRT \relates @@ -2596,11 +2587,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 @@ -2678,8 +2669,7 @@ QString QSysInfo::kernelVersion() "unknown" otherwise. \b{Windows note}: this function returns "winphone" for builds for Windows - Phone, "winrt" for WinRT builds, "wince" for Windows CE and Embedded - Compact 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". -- cgit v1.2.3