diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@digia.com> | 2013-03-11 15:43:29 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-11 16:06:59 +0100 |
| commit | b9d04b6f5c92f0ef4e30e2bf436be503f739a74d (patch) | |
| tree | 89332c44248c4b7e0294985a3365b3b3b9e07c3b /src/controls/qtmenuitem_p.h | |
| parent | 2eec5737c407cffe0bed8fac5c337b7b337da99e (diff) | |
| download | qtquickcontrols-b9d04b6f5c92f0ef4e30e2bf436be503f739a74d.tar.gz | |
Menu: Rename 'text' property to 'title'
Change-Id: Ib0b1445593ff48df56cd8d4d20122880c2dacca5
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Diffstat (limited to 'src/controls/qtmenuitem_p.h')
| -rw-r--r-- | src/controls/qtmenuitem_p.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/controls/qtmenuitem_p.h b/src/controls/qtmenuitem_p.h index 2392872d..81b27c49 100644 --- a/src/controls/qtmenuitem_p.h +++ b/src/controls/qtmenuitem_p.h @@ -104,7 +104,6 @@ public: class QtMenuText: public QtMenuBase { Q_OBJECT - Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged) Q_PROPERTY(bool enabled READ enabled WRITE setEnabled NOTIFY enabledChanged) Q_PROPERTY(QUrl iconSource READ iconSource WRITE setIconSource NOTIFY iconSourceChanged) Q_PROPERTY(QString iconName READ iconName WRITE setIconName NOTIFY iconNameChanged) @@ -112,11 +111,11 @@ class QtMenuText: public QtMenuBase Q_PROPERTY(QVariant __icon READ iconVariant NOTIFY __iconChanged) Q_SIGNALS: - void textChanged(); void enabledChanged(); void iconSourceChanged(); void iconNameChanged(); + void __textChanged(); void __iconChanged(); public: @@ -152,6 +151,7 @@ private: class QtMenuItem: public QtMenuText { Q_OBJECT + Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged) Q_PROPERTY(bool checkable READ checkable WRITE setCheckable NOTIFY checkableChanged) Q_PROPERTY(bool checked READ checked WRITE setChecked NOTIFY toggled) Q_PROPERTY(QtExclusiveGroup *exclusiveGroup READ exclusiveGroup WRITE setExclusiveGroup NOTIFY exclusiveGroupChanged) @@ -165,6 +165,7 @@ Q_SIGNALS: void triggered(); void toggled(bool checked); + void textChanged(); void checkableChanged(); void exclusiveGroupChanged(); void shortcutChanged(); |