diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-10-15 13:23:13 -0700 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-19 15:25:54 +0100 |
| commit | df3631045c35aaed0b9de4ae5e643c8019972d13 (patch) | |
| tree | 9e4c1bc3489d7e88ccc164f6d6c76142bcad483e /mkspecs/features/qml_plugin.prf | |
| parent | 36270e45058b84c2fc3cb9683278983eedea3a1b (diff) | |
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>
Diffstat (limited to 'mkspecs/features/qml_plugin.prf')
| -rw-r--r-- | mkspecs/features/qml_plugin.prf | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf index b938bf493e..c700dda41f 100644 --- a/mkspecs/features/qml_plugin.prf +++ b/mkspecs/features/qml_plugin.prf @@ -17,17 +17,19 @@ isEmpty(CXX_MODULE) { TARGET = declarative_$${TARGET} } isEmpty(TARGETPATH): TARGETPATH = $$eval(QT.$${CXX_MODULE}.name) -DESTDIR = $$eval(QT.$${CXX_MODULE}.imports)/$$TARGETPATH QMLTYPEFILE = $$_PRO_FILE_PWD_/plugins.qmltypes exists($$QMLTYPEFILE): QML_FILES += $$QMLTYPEFILE # Install rules -qml1_target: \ - instbase = $$[QT_INSTALL_IMPORTS]/QtDeclarative -else: \ +qml1_target { + DESTDIR = $$eval(QT.$${CXX_MODULE}.imports)/$$TARGETPATH instbase = $$[QT_INSTALL_IMPORTS] +} else { + DESTDIR = $$eval(QT.$${CXX_MODULE}.qml)/$$TARGETPATH + instbase = $$[QT_INSTALL_QML] +} target.path = $$instbase/$$TARGETPATH INSTALLS += target |