diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-09 21:52:12 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-09 21:54:50 +0100 |
| commit | ef5e426bed3b1362394c7cc0c97522bb20cacff0 (patch) | |
| tree | 0450da77b661d2e97eb7628b4c667ee22c6dc443 /src/quicktemplates2/qquicktextarea_p.h | |
| parent | 2cdec3eadc7ac1d1e5c4cd505b60196e44df1a7d (diff) | |
| parent | 10b8f6af42a1cd80273d0a2d36e75b79078b5994 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
.qmake.conf
src/quicktemplates2/qquickabstractbutton_p.h
Change-Id: I265cbd2ce51beaf2afef99292c2e2798dadb4ba3
Diffstat (limited to 'src/quicktemplates2/qquicktextarea_p.h')
| -rw-r--r-- | src/quicktemplates2/qquicktextarea_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquicktextarea_p.h b/src/quicktemplates2/qquicktextarea_p.h index 26799532..5482ceae 100644 --- a/src/quicktemplates2/qquicktextarea_p.h +++ b/src/quicktemplates2/qquicktextarea_p.h @@ -73,6 +73,7 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickTextArea : public QQuickTextEdit Q_PROPERTY(bool hoverEnabled READ isHoverEnabled WRITE setHoverEnabled RESET resetHoverEnabled NOTIFY hoverEnabledChanged FINAL REVISION 1) // 2.3 (Qt 5.10) Q_PROPERTY(QPalette palette READ palette WRITE setPalette RESET resetPalette NOTIFY paletteChanged FINAL REVISION 3) + Q_CLASSINFO("DeferredPropertyNames", "background") public: explicit QQuickTextArea(QQuickItem *parent = nullptr); |