summaryrefslogtreecommitdiffstats
path: root/src/datavisualizationqml2/datavisualizationqml2.pro
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-08-01 09:16:51 +0200
committerLiang Qi <liang.qi@qt.io>2016-08-01 09:16:51 +0200
commit2523056490c3f7a35d176deb583ba46899fe260b (patch)
tree0a38f955248b467227e4fca5aa6e161472cec2b2 /src/datavisualizationqml2/datavisualizationqml2.pro
parent1533ffc6d8afe46df72a05ecd571fd7dcb1bd397 (diff)
parent4d4a9609fab58da304e4c13b9a37531116a4fadb (diff)
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.1
Conflicts: src/datavisualization/datavisualization.pro Change-Id: Ie79d1c1e959bac9a674a9031c36e7914252805b9
Diffstat (limited to 'src/datavisualizationqml2/datavisualizationqml2.pro')
-rw-r--r--src/datavisualizationqml2/datavisualizationqml2.pro14
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