diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@digia.com> | 2013-02-28 22:08:05 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-01 11:06:55 +0100 |
| commit | a3737d7481aba3b93e23fb0c26e6a4dc13b75658 (patch) | |
| tree | c2616c8b62108c33b3fb1e9591f6fdace1cd7335 /src/controls/qtmenuitem_p.h | |
| parent | edc559b1e0bea1b4eed247e8bf9ada672d7e9dc9 (diff) | |
| download | qtquickcontrols-a3737d7481aba3b93e23fb0c26e6a4dc13b75658.tar.gz | |
MenuBar. Menu, MenuItem: Update documentation to new API
Also removed Menu.visibleParent since it had no apparent use. Likewise,
trigger(), and the triggered() signal are now only in MenuItem.
Change-Id: Ide194505664c60906019422a503b189250d6a86e
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Diffstat (limited to 'src/controls/qtmenuitem_p.h')
| -rw-r--r-- | src/controls/qtmenuitem_p.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/controls/qtmenuitem_p.h b/src/controls/qtmenuitem_p.h index 0dd4f424..8644a490 100644 --- a/src/controls/qtmenuitem_p.h +++ b/src/controls/qtmenuitem_p.h @@ -110,16 +110,11 @@ class QtMenuText: public QtMenuBase Q_PROPERTY(QUrl iconSource READ iconSource WRITE setIconSource NOTIFY iconSourceChanged) Q_PROPERTY(QString iconName READ iconName WRITE setIconName NOTIFY iconNameChanged) - Q_PROPERTY(QVariant __icon READ iconVariant NOTIFY __iconChanged) - -public Q_SLOTS: - virtual void trigger(); + Q_PROPERTY(QVariant __icon READ iconVariant NOTIFY __iconChanged) Q_SIGNALS: - void triggered(); void textChanged(); void enabledChanged(); - void iconSourceChanged(); void iconNameChanged(); @@ -165,10 +160,11 @@ public Q_SLOTS: void trigger(); Q_SIGNALS: + void triggered(); + void toggled(bool checked); + void checkableChanged(); - void toggled(bool); void exclusiveGroupChanged(); - void shortcutChanged(); void actionChanged(); |