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 +++-------- src/sql/doc/src/sql-driver.qdoc | 14 -------------- 2 files changed, 3 insertions(+), 22 deletions(-) (limited to 'src') 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. diff --git a/src/sql/doc/src/sql-driver.qdoc b/src/sql/doc/src/sql-driver.qdoc index a33f60b561..364d733e92 100644 --- a/src/sql/doc/src/sql-driver.qdoc +++ b/src/sql/doc/src/sql-driver.qdoc @@ -168,8 +168,6 @@ If you are not using a Microsoft compiler, replace \c nmake with \c make in the line above. - \note This database plugin is not supported for Windows CE. - \note Including \c{"-o Makefile"} as an argument to \l qmake to tell it where to build the makefile can cause the plugin to be built in release mode only. If you are expecting a debug version @@ -261,8 +259,6 @@ \snippet code/doc_src_sql-driver.qdoc 9 - \b{Note:} This database plugin is not supported for Windows CE. - \target QODBC \section2 QODBC for Open Database Connectivity (ODBC) @@ -365,8 +361,6 @@ If you are not using a Microsoft compiler, replace \c nmake with \c make in the line above. - \b{Note:} This database plugin is not officially supported for Windows CE. - \target QPSQL \section2 QPSQL for PostgreSQL (Version 7.3 and Above) @@ -426,8 +420,6 @@ Users of MinGW may wish to consult the following online document: \l{http://www.postgresql.org/docs/current/static/installation-platform-notes.html#INSTALLATION-NOTES-MINGW}{PostgreSQL MinGW/Native Windows}. - \b{Note:} This database plugin is not supported for Windows CE. - \target QTDS \section2 QTDS for Sybase Adaptive Server @@ -475,8 +467,6 @@ are not using a Microsoft compiler, replace \c nmake with \c make in the line above. - \b{Note:} This database plugin is not supported for Windows CE. - \target QDB2 \section2 QDB2 for IBM DB2 (Version 7.1 and Above) @@ -512,8 +502,6 @@ If you are not using a Microsoft compiler, replace \c nmake with \c make in the line above. - \b{Note:} This database plugin is not supported for Windows CE. - \target QSQLITE2 \section2 QSQLITE2 for SQLite Version 2 @@ -674,8 +662,6 @@ Note that \c{C:\interbase\bin} must be in the \c PATH. - \b{Note:} This database plugin is not supported for Windows CE. - \target troubleshooting \section1 Troubleshooting -- cgit v1.2.3