diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2017-05-31 12:05:26 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2017-05-31 12:05:39 +0200 |
| commit | dece229a7c2284598c36fb668de766309a6893cf (patch) | |
| tree | 6e34cfa52416b2f27d2fa0631cf34f8ffd171be4 /src/qml/types/qqmldelegatemodel_p_p.h | |
| parent | e2520ff76be49c5aa917741cc6a380fe1549e47d (diff) | |
| parent | c158ca8be49a75026e83751dfd825c5bdd63189a (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/scenegraphng
Change-Id: Iea0bb0788357bc615d0e9ea411087114b8b3b720
Diffstat (limited to 'src/qml/types/qqmldelegatemodel_p_p.h')
| -rw-r--r-- | src/qml/types/qqmldelegatemodel_p_p.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/qml/types/qqmldelegatemodel_p_p.h b/src/qml/types/qqmldelegatemodel_p_p.h index cb4a1f79ba..4ebfd9b938 100644 --- a/src/qml/types/qqmldelegatemodel_p_p.h +++ b/src/qml/types/qqmldelegatemodel_p_p.h @@ -112,11 +112,6 @@ public: QObject *modelObject() { return this; } - void incubateObject( - QQmlComponent *component, - QQmlEngine *engine, - QQmlContextData *context, - QQmlContextData *forContext); void destroyObject(); static QQmlDelegateModelItem *dataForObject(QObject *object); |