diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-02-20 15:53:42 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-02-24 13:04:47 +0000 |
| commit | 94e53934555757b12a40ea17009ea43f2121e485 (patch) | |
| tree | 1f183154d9a6e4a6a26c88c0140ba7e640abe20d /src/quicktemplates2/qquickapplicationwindow_p.h | |
| parent | c7994835630cf5a34fda22829d6462b8a0d34ae9 (diff) | |
ApplicationWindow: fix typo
It was meant to be called contentData, as the getter is called,
but the part in the Q_PROPERTY macro that specifies the name of
the property contained "data" in place of "contentData".
[ChangeLog][Controls][ApplicationWindow] The data-property has
been renamed to contentData, as it was documented. Notice that
a data-property still exists in QML Window, but is no longer
overshadowed in ApplicationWindow.
Task-number: QTBUG-58932
Change-Id: I5251d42f5ae5ef6d04d87c3f8d20d7adbefe1eb5
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickapplicationwindow_p.h')
| -rw-r--r-- | src/quicktemplates2/qquickapplicationwindow_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quicktemplates2/qquickapplicationwindow_p.h b/src/quicktemplates2/qquickapplicationwindow_p.h index 2c5e604c..07ddc67e 100644 --- a/src/quicktemplates2/qquickapplicationwindow_p.h +++ b/src/quicktemplates2/qquickapplicationwindow_p.h @@ -65,14 +65,14 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickApplicationWindow : public QQuickWi Q_OBJECT Q_PROPERTY(QQuickItem *background READ background WRITE setBackground NOTIFY backgroundChanged FINAL) Q_PROPERTY(QQuickItem *contentItem READ contentItem CONSTANT FINAL) - Q_PROPERTY(QQmlListProperty<QObject> data READ contentData FINAL) + Q_PROPERTY(QQmlListProperty<QObject> contentData READ contentData FINAL) Q_PROPERTY(QQuickItem *activeFocusControl READ activeFocusControl NOTIFY activeFocusControlChanged FINAL) Q_PROPERTY(QQuickItem *header READ header WRITE setHeader NOTIFY headerChanged FINAL) Q_PROPERTY(QQuickItem *footer READ footer WRITE setFooter NOTIFY footerChanged FINAL) Q_PROPERTY(QQuickOverlay *overlay READ overlay CONSTANT FINAL) Q_PROPERTY(QFont font READ font WRITE setFont RESET resetFont NOTIFY fontChanged FINAL) Q_PROPERTY(QLocale locale READ locale WRITE setLocale RESET resetLocale NOTIFY localeChanged FINAL) - Q_CLASSINFO("DefaultProperty", "data") + Q_CLASSINFO("DefaultProperty", "contentData") public: explicit QQuickApplicationWindow(QWindow *parent = nullptr); |