Move exports conflicting with QtDeclarative into namespace
authorKai Koehne <kai.koehne@digia.com>
Wed, 8 May 2013 08:24:15 +0000 (10:24 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Wed, 15 May 2013 07:32:58 +0000 (09:32 +0200)
commitc74e4a74ba97d32df7406fb684527d415dd8a6ba
treec3da314e5d631d43a6facb1d0b5c051c2a6cf5ac
parent3dbbfe0a9c7dfa309eaed05c49763706428fd0c8
Move exports conflicting with QtDeclarative into namespace

Move exported qml* symbols that conflict with QtDeclarative into an
- automatically imported - namespace. This ensures apps can
link against both QtDeclarative and QtQml.

To keep the BC promise the old symbols are still exported.

Task-number: QTBUG-29584
Change-Id: I3d31c36ca4e2faaf6f5d67a77c5c5a304c0338a4
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
src/qml/qml/qqml.h
src/qml/qml/qqmlengine.cpp
src/qml/qml/qqmlinfo.cpp
src/qml/qml/qqmlinfo.h