diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2018-01-18 13:36:26 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2018-01-18 13:36:26 +0100 |
| commit | deb779cdbaeeaea52ca0e99c9295db587c25f41c (patch) | |
| tree | 82765e08678818ed21a6f9d5354ac852b0613460 /src/quicktemplates2/qquicktumbler_p.h | |
| parent | 26056b52b182b4452855f54a2c811d64246c434a (diff) | |
| parent | d64774add9fafa24406a202d0313e10780e1e715 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
src/imports/controls/Tumbler.qml
src/quicktemplates2/qquicktumbler.cpp
src/quicktemplates2/qquicktumbler_p.h
src/quicktemplates2/qquicktumbler_p_p.h
Change-Id: I8d50991183fe3c5b50a49e00f01bcd3049f5346c
Diffstat (limited to 'src/quicktemplates2/qquicktumbler_p.h')
| -rw-r--r-- | src/quicktemplates2/qquicktumbler_p.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/quicktemplates2/qquicktumbler_p.h b/src/quicktemplates2/qquicktumbler_p.h index c388c28d..5d4df4a7 100644 --- a/src/quicktemplates2/qquicktumbler_p.h +++ b/src/quicktemplates2/qquicktumbler_p.h @@ -70,7 +70,6 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickTumbler : public QQuickControl Q_PROPERTY(bool wrap READ wrap WRITE setWrap RESET resetWrap NOTIFY wrapChanged FINAL REVISION 1) // 2.2 (Qt 5.9) Q_PROPERTY(bool moving READ isMoving NOTIFY movingChanged FINAL REVISION 2) - Q_CLASSINFO("DeferredPropertyNames", "background") public: explicit QQuickTumbler(QQuickItem *parent = nullptr); |