diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-02 10:19:52 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-02 10:19:52 +0200 |
| commit | 43c0bfb2af436f6b27cdccb156ecac1d1f3711dc (patch) | |
| tree | 4767c7bd4e78baf68961c474aed727a949f86b74 /src/datavisualizationqml2 | |
| parent | e91b9713cc956770a38c1ba4db996c24612c4fa4 (diff) | |
| parent | 2523056490c3f7a35d176deb583ba46899fe260b (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
.qmake.conf
Change-Id: I709c31705a7edc722039caa4b1c57a0627bde8b9
Diffstat (limited to 'src/datavisualizationqml2')
| -rw-r--r-- | src/datavisualizationqml2/datavisualizationqml2.pro | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/src/datavisualizationqml2/datavisualizationqml2.pro b/src/datavisualizationqml2/datavisualizationqml2.pro index 3f855a27..301ac439 100644 --- a/src/datavisualizationqml2/datavisualizationqml2.pro +++ b/src/datavisualizationqml2/datavisualizationqml2.pro @@ -1,11 +1,8 @@ TARGET = datavisualizationqml2 +CXX_MODULE = datavisualization QT += qml quick datavisualization osx: QT += gui-private TARGETPATH = QtDataVisualization -IMPORT_VERSION = $$MODULE_VERSION - -# Only build qml plugin static if Qt itself is also built static -!contains(QT_CONFIG, static): CONFIG -= static staticlib include($$PWD/designer/designer.pri) @@ -48,18 +45,9 @@ HEADERS += \ glstatestore_p.h \ enumtostringmap_p.h -OTHER_FILES = qmldir - -CONFIG += no_cxx_module - load(qml_plugin) win32 { - CONFIG += skip_target_version_ext - VERSION = $$MODULE_VERSION QMAKE_TARGET_PRODUCT = "Qt Data Visualization (Qt $$QT_VERSION)" QMAKE_TARGET_DESCRIPTION = "3D Data Visualization QML plugin for Qt." } - -QML_FILES += \ - $$PWD/plugins.qmltypes |