Skip to content

Commit

Permalink
Doc: Remove references to Windows CE in Qt Widgets
Browse files Browse the repository at this point in the history
The platform is not supported since Qt 5.7

Task-number: QTBUG-55331
Change-Id: Idb6d4a31488ca849f0925a362e5ab1e83584e3cb
Reviewed-by: Topi Reiniö <[email protected]>
  • Loading branch information
veshivas committed Aug 22, 2016
1 parent 519b8d1 commit 808ccf4
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 41 deletions.
3 changes: 1 addition & 2 deletions src/widgets/dialogs/qfiledialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2422,8 +2422,7 @@ QUrl QFileDialog::getSaveFileUrl(QWidget *parent,
native file dialog and not a QFileDialog. However, the native Windows file
dialog does not support displaying files in the directory chooser. You need
to pass \l{QFileDialog::}{DontUseNativeDialog} to display files using a
QFileDialog. On Windows CE, if the device has no native file dialog, a
QFileDialog will be used.
QFileDialog.
On Unix/X11, the normal behavior of the file dialog is to resolve and
follow symlinks. For example, if \c{/usr/tmp} is a symlink to \c{/var/tmp},
Expand Down
19 changes: 5 additions & 14 deletions src/widgets/kernel/qapplication.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1026,7 +1026,7 @@ bool QApplication::compressEvent(QEvent *event, QObject *receiver, QPostEventLis
\property QApplication::autoMaximizeThreshold
\since 4.4
\brief defines a threshold for auto maximizing widgets
\deprecated
\b{The auto maximize threshold is only available as part of Qt for
Windows CE.}
Expand Down Expand Up @@ -1056,8 +1056,8 @@ bool QApplication::compressEvent(QEvent *event, QObject *receiver, QPostEventLis
the WA_InputMethodEnabled attribute set, and is typically used to launch
a virtual keyboard on devices which have very few or no keys.
\b{ The property only has an effect on platforms which use software input
panels, such as Windows CE.}
\b{ The property only has an effect on platforms that use software input
panels.}
The default is platform dependent.
*/
Expand Down Expand Up @@ -3927,12 +3927,7 @@ void QApplicationPrivate::openPopup(QWidget *popup)
/*!
Sets the kind of focus navigation Qt should use to \a mode.
This feature is available in Qt for Embedded Linux, and Windows CE
only.
\note On Windows CE this feature is disabled by default for touch device
mkspecs. To enable keypad navigation, build Qt with
QT_KEYPAD_NAVIGATION defined.
This feature is available in Qt for Embedded Linux only.
\since 4.6
Expand All @@ -3946,11 +3941,7 @@ void QApplication::setNavigationMode(Qt::NavigationMode mode)
/*!
Returns what kind of focus navigation Qt is using.
This feature is available in Qt for Embedded Linux, and Windows CE only.
\note On Windows CE this feature is disabled by default for touch device
mkspecs. To enable keypad navigation, build Qt with
QT_KEYPAD_NAVIGATION defined.
This feature is available in Qt for Embedded Linux only.
\since 4.6
Expand Down
4 changes: 1 addition & 3 deletions src/widgets/kernel/qwidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11331,9 +11331,7 @@ bool QWidget::testAttribute_helper(Qt::WidgetAttribute attribute) const
This feature is available on Embedded Linux, \macos, Windows,
and X11 platforms that support the Composite extension.

This feature is not available on Windows CE.

Note that under X11 you need to have a composite manager running,
\note On X11 you need to have a composite manager running,
and the X11 specific _NET_WM_WINDOW_OPACITY atom needs to be
supported by the window manager you are using.

Expand Down
6 changes: 0 additions & 6 deletions src/widgets/widgets/qmenu.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1435,12 +1435,6 @@ void QMenu::initStyleOption(QStyleOptionMenuItem *option, const QAction *action)
\warning To make QMenu visible on the screen, exec() or popup() should be
used instead of show().

\section1 QMenu on Qt for Windows CE

If a menu is integrated into the native menubar on Windows Mobile we
do not support the signals: aboutToHide (), aboutToShow () and hovered ().
It is not possible to display an icon in a native menu on Windows Mobile.

\section1 QMenu on \macos with Qt Build Against Cocoa

QMenu can be inserted only once in a menu/menubar. Subsequent insertions will
Expand Down
19 changes: 3 additions & 16 deletions src/widgets/widgets/qmenubar.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -666,18 +666,6 @@ void QMenuBar::initStyleOption(QStyleOptionMenuItem *option, const QAction *acti
the application's bundle. See \l{Qt for macOS - Deployment}
for more information.

\section1 QMenuBar on Windows CE

QMenuBar on Windows CE is a wrapper for using the system-wide menu bar,
similar to the Mac. This feature is activated for Windows Mobile
and integrates QMenuBar with the native soft keys. The left soft
key can be controlled with QMenuBar::setDefaultAction() and the
right soft key can be used to access the menu bar.

The hovered() signal is not supported for the native menu
integration. Also, it is not possible to display an icon in a
native menu on Windows Mobile.

\section1 Examples

The \l{mainwindows/menus}{Menus} example shows how to use QMenuBar
Expand Down Expand Up @@ -1821,10 +1809,9 @@ QWidget *QMenuBar::cornerWidget(Qt::Corner corner) const
\brief Whether or not a menubar will be used as a native menubar on platforms that support it
\since 4.6

This property specifies whether or not the menubar should be used as a native menubar on platforms
that support it. The currently supported platforms are \macos and Windows CE. On these platforms
if this property is \c true, the menubar is used in the native menubar and is not in the window of
its parent, if false the menubar remains in the window. On other platforms the value of this
This property specifies whether or not the menubar should be used as a native menubar on \macos.
If this property is \c true, the menubar is used in the native menubar and is not in the window of
its parent, if \c false the menubar remains in the window. On other platforms the value of this
attribute has no effect.

The default is to follow whether the Qt::AA_DontUseNativeMenuBar attribute
Expand Down

0 comments on commit 808ccf4

Please sign in to comment.