diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-03-18 09:56:15 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-03-18 13:08:29 +0000 |
| commit | 9e6389591e781e76d17dc99f9395219785797b32 (patch) | |
| tree | 7e3702cdfa09c95934a52da7dcee70c74f0d023a /src | |
| parent | 96bc218b36f9732544ae59ccbba834230f3e6ea0 (diff) | |
| parent | fe1b0c6f1c5f34f67699b67c0d0393f2675c9eaf (diff) | |
| download | qtquickcontrols-9e6389591e781e76d17dc99f9395219785797b32.tar.gz | |
Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5
Diffstat (limited to 'src')
| -rw-r--r-- | src/controls/doc/images/menubar-action.png | bin | 0 -> 3949 bytes | |||
| -rw-r--r-- | src/controls/doc/src/qtquickcontrolsstyles-index.qdoc | 1 | ||||
| -rw-r--r-- | src/controls/doc/src/views.qdoc | 1 | ||||
| -rw-r--r-- | src/controls/qquickaction.cpp | 2 |
4 files changed, 3 insertions, 1 deletions
diff --git a/src/controls/doc/images/menubar-action.png b/src/controls/doc/images/menubar-action.png Binary files differnew file mode 100644 index 00000000..9761762d --- /dev/null +++ b/src/controls/doc/images/menubar-action.png diff --git a/src/controls/doc/src/qtquickcontrolsstyles-index.qdoc b/src/controls/doc/src/qtquickcontrolsstyles-index.qdoc index 59951190..94eb6fb4 100644 --- a/src/controls/doc/src/qtquickcontrolsstyles-index.qdoc +++ b/src/controls/doc/src/qtquickcontrolsstyles-index.qdoc @@ -34,6 +34,7 @@ /*! \group viewsstyling \title Styling Views + \brief How to add custom styles for views. */ /*! diff --git a/src/controls/doc/src/views.qdoc b/src/controls/doc/src/views.qdoc index 79392b06..ca5438fe 100644 --- a/src/controls/doc/src/views.qdoc +++ b/src/controls/doc/src/views.qdoc @@ -27,5 +27,6 @@ /*! \group views + \brief How to add views and navigation within an application. \title Application Navigation and Views */ diff --git a/src/controls/qquickaction.cpp b/src/controls/qquickaction.cpp index 6dc07f87..90a1fd67 100644 --- a/src/controls/qquickaction.cpp +++ b/src/controls/qquickaction.cpp @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE \inqmlmodule QtQuick.Controls \brief Action provides an abstract user interface action that can be bound to items - \image menubar.png + \image menubar-action.png In applications many common commands can be invoked via menus, toolbar buttons, and keyboard shortcuts. Since the user expects each command to be performed in the same way, regardless of |
