Allow QtDeclarative and QtQml to co-exist at run-time v5.2.0
authorSimon Hausmann <simon.hausmann@digia.com>
Mon, 25 Nov 2013 09:29:45 +0000 (10:29 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Tue, 26 Nov 2013 16:26:49 +0000 (17:26 +0100)
commit2866c00375313d1726cc0473b6b7bfc87b984c78
treeb29a10d1fb3238c824b5bbaf0dd6df6e12e8cd9d
parentd9ed35f95835def9e3201719d986b56c01b160a2
Allow QtDeclarative and QtQml to co-exist at run-time

This patch changes QDeclarativeData to share the very first bit with QtQml's
QQmlData, to indicate ownership by either run-time. We need to check the bit in
the only QObject callback we use (destroyed), the other callback was unused and
removed.

Task-number: QTBUG-35006

Change-Id: Ife4b515648cba42b91612736ccd9375f1f46808a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
src/declarative/qml/qdeclarativedata_p.h
src/declarative/qml/qdeclarativeengine.cpp
src/declarative/qml/qdeclarativevme.cpp