diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-02-12 15:53:02 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-02-12 15:53:02 +0100 |
| commit | 1a5413df3d9a0602f074562e2e92751df369d016 (patch) | |
| tree | 461a56ee176e873bee441fe4d899d7a683deca9d /src/controls/Menu.qml | |
| parent | a2f81b85d5dfa7fbd3b11557fe38de649a1f6914 (diff) | |
| parent | 9af9dabe3c88baa87befe5a4591d7f3508888307 (diff) | |
| download | qtquickcontrols-1a5413df3d9a0602f074562e2e92751df369d016.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/controls/TableView.qml
tests/auto/controls/data/tst_gridlayout.qml
Change-Id: I030bc50dc8fcf7b6b00e183dc3a67c3cd012f3fb
Diffstat (limited to 'src/controls/Menu.qml')
| -rw-r--r-- | src/controls/Menu.qml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/controls/Menu.qml b/src/controls/Menu.qml index 7d90e19e..2ab229ab 100644 --- a/src/controls/Menu.qml +++ b/src/controls/Menu.qml @@ -44,8 +44,8 @@ import QtQuick.Controls.Private 1.0 \inqmlmodule QtQuick.Controls \since 5.1 \ingroup menus - \brief Provides a menu component for use in menu bars, as context menu, - and other popup menus. + \brief Provides a menu component for use as a context menu, popup menu, or + as part of a menu bar. \image menu.png |