diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-02-12 12:27:31 +0200 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-02-13 06:23:16 +0200 |
| commit | 396a01b4748decf4080add69471ee846a3d2dc46 (patch) | |
| tree | bd28fe86dede542ae54c6410ddb5af9c941231de /src/datavisualizationqml2/datavisualizationqml2.pro | |
| parent | da3a9d21f5dbbc50d6db9cde81a96f7af9bba093 (diff) | |
Take qml_plugin.prf into use
Enables us to lose a bunch of hacks.
Change-Id: Id7641012004428aa9782cfb5dbaf9fc9c4629706
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavisualizationqml2/datavisualizationqml2.pro')
| -rw-r--r-- | src/datavisualizationqml2/datavisualizationqml2.pro | 39 |
1 files changed, 13 insertions, 26 deletions
diff --git a/src/datavisualizationqml2/datavisualizationqml2.pro b/src/datavisualizationqml2/datavisualizationqml2.pro index 6396b86b..97f6c87e 100644 --- a/src/datavisualizationqml2/datavisualizationqml2.pro +++ b/src/datavisualizationqml2/datavisualizationqml2.pro @@ -1,19 +1,10 @@ -TEMPLATE = lib TARGET = datavisualizationqml2 QT += qml quick datavisualization -CONFIG += qt plugin +TARGETPATH = QtDataVisualization +IMPORT_VERSION = $$MODULE_VERSION -TARGET = $$qtLibraryTarget($$TARGET) -uri = QtDataVisualization - -static { - DEFINES += QT_DATAVISUALIZATION_STATICLIB - # Only build qml plugin static if Qt itself is also built static - !contains(QT_CONFIG, static): CONFIG -= static staticlib - - # Insert the plugin URI into its meta data to enable static plugin usage - QMAKE_MOC_OPTIONS += -Muri=$$uri -} +# Only build qml plugin static if Qt itself is also built static +!contains(QT_CONFIG, static): CONFIG -= static staticlib INCLUDEPATH += ../../include \ ../../include/QtDataVisualization \ @@ -48,18 +39,14 @@ HEADERS += \ OTHER_FILES = qmldir -!equals(_PRO_FILE_PWD_, $$OUT_PWD) { - copy_qmldir.target = $$OUT_PWD/qmldir - copy_qmldir.depends = $$_PRO_FILE_PWD_/qmldir - copy_qmldir.commands = $(COPY_FILE) \"$$replace(copy_qmldir.depends, /, $$QMAKE_DIR_SEP)\" \"$$replace(copy_qmldir.target, /, $$QMAKE_DIR_SEP)\" - QMAKE_EXTRA_TARGETS += copy_qmldir - PRE_TARGETDEPS += $$copy_qmldir.target -} - -qmldir.files = qmldir +CONFIG += no_cxx_module -installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /) -qmldir.path = $$installPath -target.path = $$installPath -INSTALLS += target qmldir +load(qml_plugin) +# Copy qmldir to DESTDIR so we can use the plugin directly from there in our examples +# without having to do 'make install'. +copy_qmldir.target = $$DESTDIR/qmldir +copy_qmldir.depends = $$_PRO_FILE_PWD_/qmldir +copy_qmldir.commands = $(COPY_FILE) \"$$replace(copy_qmldir.depends, /, $$QMAKE_DIR_SEP)\" \"$$replace(copy_qmldir.target, /, $$QMAKE_DIR_SEP)\" +QMAKE_EXTRA_TARGETS += copy_qmldir +PRE_TARGETDEPS += $$copy_qmldir.target |