diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-30 03:04:24 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-30 03:04:24 +0100 |
| commit | 9a9ae6be7d278cdcaf6ac99ea22b3d6cf1093313 (patch) | |
| tree | 616c31b355cd94fd53749fec87cd87df3cfeb1a5 /src/imports/platform/qquickplatformmenu.cpp | |
| parent | 80f1186338bcf8c7d692b4fadfc46531c002c6b0 (diff) | |
| parent | 8ee511bcd9f1376e9995ab3f30f6415ad60b7c05 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Icb923b10d2b6c524ebaa8b38c7979b780e3582d4
Diffstat (limited to 'src/imports/platform/qquickplatformmenu.cpp')
| -rw-r--r-- | src/imports/platform/qquickplatformmenu.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/platform/qquickplatformmenu.cpp b/src/imports/platform/qquickplatformmenu.cpp index 844fbbd9..1f5f52d7 100644 --- a/src/imports/platform/qquickplatformmenu.cpp +++ b/src/imports/platform/qquickplatformmenu.cpp @@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE /*! \qmltype Menu \inherits QtObject - \instantiates QQuickPlatformMenu +//! \instantiates QQuickPlatformMenu \inqmlmodule Qt.labs.platform \since 5.8 \brief A native menu. @@ -127,7 +127,7 @@ QT_BEGIN_NAMESPACE \section2 Dynamically Generating Menu Items It is possible to dynamically generate menu items. One of the easiest ways - to do so is with \l Instantiator. For example, to implement a + to do so is with \l[QtQml]{Instantiator}. For example, to implement a "Recent Files" submenu, where the items are based on a list of files stored in settings, the following code could be used: |