diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-29 13:51:16 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-29 15:30:17 +0200 |
| commit | 1cc571593a67f3e688a5cbb896f0be71ca5a2b30 (patch) | |
| tree | c652360c9276cbf475244fd02313d64e3df11a96 /src/widgets/widgets/qmenubar.cpp | |
| parent | 829c59aa4acf94bd979f6a3162808be36802d79a (diff) | |
| parent | cc74452d6d259d36ac47c536f11a5efb269e8e44 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
cf53aa21bf0f8fbd13c0ce2d33ddf7bc63d0d76a and 3aaa5d6b32130d3eeac872a59a5a44bfb20dfd4a
were reverted because of reconstruction in 5.7.
defineTest(qtConfTest_checkCompiler) in configure.pri is smart
enough to cover the case in a9474d1260a8c8cc9eae14f2984098919d9684e5.
DirectWrite: Fix advances being scaled to 0
Since 131eee5cd, the stretch of a font can be 0, meaning
"whatever the font provides". In combination with ec7fee96,
this would cause advances in the DirectWrite engine to be scaled to
0, causing the QRawFont test to fail.
Conflicts:
configure
mkspecs/features/uikit/device_destinations.sh
mkspecs/features/uikit/xcodebuild.mk
src/corelib/global/qglobal.cpp
src/corelib/global/qnamespace.qdoc
src/plugins/platforms/cocoa/qcocoamenuitem.h
src/plugins/platforms/windows/qwindowsservices.cpp
src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.cpp
src/plugins/platforms/windows/qwindowsfontenginedirectwrite.cpp
src/widgets/kernel/qapplication.cpp
tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp
Change-Id: I4656d8133da7ee9fcc84ad3f1c7950f924432d1e
Diffstat (limited to 'src/widgets/widgets/qmenubar.cpp')
| -rw-r--r-- | src/widgets/widgets/qmenubar.cpp | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/src/widgets/widgets/qmenubar.cpp b/src/widgets/widgets/qmenubar.cpp index 68262bb8e4..99fddee53d 100644 --- a/src/widgets/widgets/qmenubar.cpp +++ b/src/widgets/widgets/qmenubar.cpp @@ -662,18 +662,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 @@ -1795,10 +1783,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 |