diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-02-26 13:55:25 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-02-26 13:57:49 +0200 |
| commit | d6e8b26e2e5441750f342da4f78c6aa1be1ea452 (patch) | |
| tree | ffe94467846662cd161a966008b5e2046dcb6638 /src/datavisualizationqml2/datavisualizationqml2.pro | |
| parent | b368e57e59351736f9ad06834a743a7c1b49d368 (diff) | |
| parent | cd334eb5eb93314a958dd58a0df57adcd2a198c5 (diff) | |
Merge branch 'develop'
Change-Id: I8307181395127e42efeb4e3ecb9bfa59b0a25b33
Diffstat (limited to 'src/datavisualizationqml2/datavisualizationqml2.pro')
| -rw-r--r-- | src/datavisualizationqml2/datavisualizationqml2.pro | 41 |
1 files changed, 17 insertions, 24 deletions
diff --git a/src/datavisualizationqml2/datavisualizationqml2.pro b/src/datavisualizationqml2/datavisualizationqml2.pro index 6396b86b..df6c647d 100644 --- a/src/datavisualizationqml2/datavisualizationqml2.pro +++ b/src/datavisualizationqml2/datavisualizationqml2.pro @@ -1,19 +1,12 @@ -TEMPLATE = lib TARGET = datavisualizationqml2 QT += qml quick datavisualization -CONFIG += qt plugin +TARGETPATH = QtDataVisualization +IMPORT_VERSION = $$MODULE_VERSION -TARGET = $$qtLibraryTarget($$TARGET) -uri = QtDataVisualization +# Only build qml plugin static if Qt itself is also built static +!contains(QT_CONFIG, static): CONFIG -= static staticlib -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 -} +include($$PWD/designer/designer.pri) INCLUDEPATH += ../../include \ ../../include/QtDataVisualization \ @@ -32,7 +25,8 @@ SOURCES += \ declarativeseries.cpp \ declarativetheme.cpp \ declarativecolor.cpp \ - declarativescene.cpp + declarativescene.cpp \ + declarativerendernode.cpp HEADERS += \ datavisualizationqml2_plugin.h \ @@ -44,22 +38,21 @@ HEADERS += \ declarativeseries_p.h \ declarativetheme_p.h \ declarativecolor_p.h \ - declarativescene_p.h + declarativescene_p.h \ + declarativerendernode_p.h OTHER_FILES = qmldir -!equals(_PRO_FILE_PWD_, $$OUT_PWD) { - copy_qmldir.target = $$OUT_PWD/qmldir +CONFIG += no_cxx_module + +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'. +!android:!ios { + 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 } - -qmldir.files = qmldir - -installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /) -qmldir.path = $$installPath -target.path = $$installPath -INSTALLS += target qmldir - |