diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-21 09:24:03 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-21 09:24:03 +0200 |
| commit | cb5cbe9eb7c9a68acbe19ff2fd0c299e30f42eca (patch) | |
| tree | 2ba783322c213c9c533163dc69c950367f767a44 /src/quick/items/qquickitem_p.h | |
| parent | 8de7ec4bf82c35ff1413fb5f5a5ca1788dc93af3 (diff) | |
| parent | 16914894f035963ace51c92de13aad11a53c3cf8 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
src/qml/compiler/qv4isel_moth_p.h
Change-Id: I8e86a649d1ef8ad27dc66cc8c290093b2faabc69
Diffstat (limited to 'src/quick/items/qquickitem_p.h')
| -rw-r--r-- | src/quick/items/qquickitem_p.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/quick/items/qquickitem_p.h b/src/quick/items/qquickitem_p.h index 9e4c7bc0e8..7a39b7c4c7 100644 --- a/src/quick/items/qquickitem_p.h +++ b/src/quick/items/qquickitem_p.h @@ -244,8 +244,6 @@ public: static QQuickItemPrivate* get(QQuickItem *item) { return item->d_func(); } static const QQuickItemPrivate* get(const QQuickItem *item) { return item->d_func(); } - static void registerAccessorProperties(); - QQuickItemPrivate(); ~QQuickItemPrivate(); void init(QQuickItem *parent); |