Add a new location for QML 2.x imports
authorThiago Macieira <thiago.macieira@intel.com>
Mon, 15 Oct 2012 20:23:13 +0000 (13:23 -0700)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Mon, 19 Nov 2012 14:25:54 +0000 (15:25 +0100)
commitdf3631045c35aaed0b9de4ae5e643c8019972d13
tree9e4c1bc3489d7e88ccc164f6d6c76142bcad483e
parent36270e45058b84c2fc3cb9683278983eedea3a1b
Add a new location for QML 2.x imports

This commits adds a -qmldir configuration option for the configures to
allow the user to change the default location (it defaults to
$archdatadir/qml).

It adds a QLibraryInfo::Qml2ImportsPath value for
QLibraryInfo::location, a qmake property of QT_INSTALL_QML and a qt.conf
configure location entry "Qml2Imports".

At the same time, it makes the qmake .prf files dealing with QML plugins
be the QML 2 version. Those files are new in Qt 5, so we have the option
to choose which version we want to use.

Discussed-on: http://lists.qt-project.org/pipermail/development/2012-October/007136.html
Change-Id: I8c1c53e8685a5934ed0a9a42ba5663297b81a677
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
configure
mkspecs/features/qml_module.prf
mkspecs/features/qml_plugin.prf
mkspecs/features/qt_config.prf
mkspecs/features/qt_module.prf
mkspecs/features/qt_module_fwdpri.prf
qmake/property.cpp
src/corelib/global/qlibraryinfo.cpp
src/corelib/global/qlibraryinfo.h
tools/configure/configureapp.cpp