From 997bc1f796938eb8347adfd79b6756ea8b2b3ab9 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Thu, 9 Jan 2014 08:29:11 +0200 Subject: Invalid point/selection as constant property in qml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also fixed 0,0 QPoint -> QPointF conversion issue for Q3DScene Task-number: QTRD-2688 Change-Id: I3778081bb6ef2b5dbfcaad7502a4e164286c2646 Reviewed-by: Pasi Keränen --- src/datavisualizationqml2/datavisualizationqml2.pro | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/datavisualizationqml2/datavisualizationqml2.pro') diff --git a/src/datavisualizationqml2/datavisualizationqml2.pro b/src/datavisualizationqml2/datavisualizationqml2.pro index 989b52b9..7c456586 100644 --- a/src/datavisualizationqml2/datavisualizationqml2.pro +++ b/src/datavisualizationqml2/datavisualizationqml2.pro @@ -27,7 +27,8 @@ SOURCES += \ colorgradient.cpp \ declarativeseries.cpp \ declarativetheme.cpp \ - declarativecolor.cpp + declarativecolor.cpp \ + declarativescene.cpp HEADERS += \ datavisualizationqml2_plugin.h \ @@ -38,7 +39,8 @@ HEADERS += \ colorgradient_p.h \ declarativeseries_p.h \ declarativetheme_p.h \ - declarativecolor_p.h + declarativecolor_p.h \ + declarativescene_p.h OTHER_FILES = qmldir -- cgit v1.2.3 From 99d7cbbb8887382ea17dcbeb90a8d768bb9ebdb5 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Fri, 10 Jan 2014 15:08:47 +0200 Subject: Improve static build support. Now qml plugin can also be built statically. Change-Id: Id37f565ab9e02529fafaffa024acd69560b3703a Reviewed-by: Mika Salmela --- src/datavisualizationqml2/datavisualizationqml2.pro | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/datavisualizationqml2/datavisualizationqml2.pro') diff --git a/src/datavisualizationqml2/datavisualizationqml2.pro b/src/datavisualizationqml2/datavisualizationqml2.pro index 7c456586..6396b86b 100644 --- a/src/datavisualizationqml2/datavisualizationqml2.pro +++ b/src/datavisualizationqml2/datavisualizationqml2.pro @@ -8,7 +8,11 @@ uri = QtDataVisualization static { DEFINES += QT_DATAVISUALIZATION_STATICLIB - CONFIG -= static 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 } INCLUDEPATH += ../../include \ -- cgit v1.2.3