Use the new QLibraryInfo::Qml2ImportsPath path for QML 2.
authorThiago Macieira <thiago.macieira@intel.com>
Mon, 15 Oct 2012 21:01:59 +0000 (14:01 -0700)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Mon, 19 Nov 2012 16:38:19 +0000 (17:38 +0100)
commit7cdd8ce8bd4c68b21e7953a1e4101986f27461f9
treeb685cc6a4e8fe64adcbbf491c628bda895d9cbd0
parent0c74cbcccb52e296667c6bc171084f4946daef61
Use the new QLibraryInfo::Qml2ImportsPath path for QML 2.

Also change the environment variable to be QML2_IMPORT_PATH.  This
splits the imports from QML 1 (the QtDeclarative library).

Change-Id: Icadbf96283b1cf071ed0deb04e8c8476da664009
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
src/qml/doc/src/modules/identifiedmodules.qdoc
src/qml/doc/src/syntax/imports.qdoc
src/qml/qml/qqmlengine.cpp
src/qml/qml/qqmlimport.cpp