summaryrefslogtreecommitdiffstats
path: root/src/datavisualizationqml2
diff options
context:
space:
mode:
Diffstat (limited to 'src/datavisualizationqml2')
-rw-r--r--src/datavisualizationqml2/abstractdeclarative_p.h4
-rw-r--r--src/datavisualizationqml2/colorgradient_p.h2
-rw-r--r--src/datavisualizationqml2/datavisualizationqml2.pro7
-rw-r--r--src/datavisualizationqml2/declarativebars_p.h4
-rw-r--r--src/datavisualizationqml2/declarativecolor_p.h2
-rw-r--r--src/datavisualizationqml2/declarativescatter_p.h4
-rw-r--r--src/datavisualizationqml2/declarativescene_p.h2
-rw-r--r--src/datavisualizationqml2/declarativeseries_p.h12
-rw-r--r--src/datavisualizationqml2/declarativesurface_p.h4
-rw-r--r--src/datavisualizationqml2/declarativetheme_p.h2
10 files changed, 25 insertions, 18 deletions
diff --git a/src/datavisualizationqml2/abstractdeclarative_p.h b/src/datavisualizationqml2/abstractdeclarative_p.h
index 9625e859..3509f7ab 100644
--- a/src/datavisualizationqml2/abstractdeclarative_p.h
+++ b/src/datavisualizationqml2/abstractdeclarative_p.h
@@ -224,7 +224,7 @@ public:
void setMargin(qreal margin);
qreal margin() const;
-public slots:
+public Q_SLOTS:
virtual void handleAxisXChanged(QAbstract3DAxis *axis) = 0;
virtual void handleAxisYChanged(QAbstract3DAxis *axis) = 0;
virtual void handleAxisZChanged(QAbstract3DAxis *axis) = 0;
@@ -247,7 +247,7 @@ protected:
virtual void handleOptimizationHintChange(QAbstract3DGraph::OptimizationHints hints);
virtual QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *);
-signals:
+Q_SIGNALS:
void selectionModeChanged(AbstractDeclarative::SelectionFlags mode);
void shadowQualityChanged(AbstractDeclarative::ShadowQuality quality);
void shadowsSupportedChanged(bool supported);
diff --git a/src/datavisualizationqml2/colorgradient_p.h b/src/datavisualizationqml2/colorgradient_p.h
index 7659b577..a2437ede 100644
--- a/src/datavisualizationqml2/colorgradient_p.h
+++ b/src/datavisualizationqml2/colorgradient_p.h
@@ -51,7 +51,7 @@ public:
QColor color() const;
void setColor(const QColor &color);
-signals:
+Q_SIGNALS:
void positionChanged(qreal position);
void colorChanged(QColor color);
diff --git a/src/datavisualizationqml2/datavisualizationqml2.pro b/src/datavisualizationqml2/datavisualizationqml2.pro
index 87376e70..332a4cf8 100644
--- a/src/datavisualizationqml2/datavisualizationqml2.pro
+++ b/src/datavisualizationqml2/datavisualizationqml2.pro
@@ -52,6 +52,13 @@ 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."
+}
+
# Copy qmldir to DESTDIR so we can use the plugin directly from there in our examples
# without having to do 'make install'.
!android:!ios {
diff --git a/src/datavisualizationqml2/declarativebars_p.h b/src/datavisualizationqml2/declarativebars_p.h
index 89126ed4..1ba8b401 100644
--- a/src/datavisualizationqml2/declarativebars_p.h
+++ b/src/datavisualizationqml2/declarativebars_p.h
@@ -89,12 +89,12 @@ public:
void setFloorLevel(float level);
float floorLevel() const;
-public slots:
+public Q_SLOTS:
void handleAxisXChanged(QAbstract3DAxis *axis);
void handleAxisYChanged(QAbstract3DAxis *axis);
void handleAxisZChanged(QAbstract3DAxis *axis);
-signals:
+Q_SIGNALS:
void rowAxisChanged(QCategory3DAxis *axis);
void valueAxisChanged(QValue3DAxis *axis);
void columnAxisChanged(QCategory3DAxis *axis);
diff --git a/src/datavisualizationqml2/declarativecolor_p.h b/src/datavisualizationqml2/declarativecolor_p.h
index 178f73ed..39a7924b 100644
--- a/src/datavisualizationqml2/declarativecolor_p.h
+++ b/src/datavisualizationqml2/declarativecolor_p.h
@@ -45,7 +45,7 @@ public:
void setColor(const QColor &color);
QColor color() const;
-signals:
+Q_SIGNALS:
void colorChanged(QColor color);
private:
diff --git a/src/datavisualizationqml2/declarativescatter_p.h b/src/datavisualizationqml2/declarativescatter_p.h
index d65ffb27..65d05915 100644
--- a/src/datavisualizationqml2/declarativescatter_p.h
+++ b/src/datavisualizationqml2/declarativescatter_p.h
@@ -67,12 +67,12 @@ public:
QScatter3DSeries *selectedSeries() const;
-public slots:
+public Q_SLOTS:
void handleAxisXChanged(QAbstract3DAxis *axis);
void handleAxisYChanged(QAbstract3DAxis *axis);
void handleAxisZChanged(QAbstract3DAxis *axis);
-signals:
+Q_SIGNALS:
void axisXChanged(QValue3DAxis *axis);
void axisYChanged(QValue3DAxis *axis);
void axisZChanged(QValue3DAxis *axis);
diff --git a/src/datavisualizationqml2/declarativescene_p.h b/src/datavisualizationqml2/declarativescene_p.h
index f98f6d3a..65bb7528 100644
--- a/src/datavisualizationqml2/declarativescene_p.h
+++ b/src/datavisualizationqml2/declarativescene_p.h
@@ -51,7 +51,7 @@ public:
QPointF selectionQueryPosition() const;
QPoint invalidSelectionPoint() const;
-signals:
+Q_SIGNALS:
void selectionQueryPositionChanged(const QPointF position);
};
diff --git a/src/datavisualizationqml2/declarativeseries_p.h b/src/datavisualizationqml2/declarativeseries_p.h
index e8b25acb..33d9611a 100644
--- a/src/datavisualizationqml2/declarativeseries_p.h
+++ b/src/datavisualizationqml2/declarativeseries_p.h
@@ -76,12 +76,12 @@ public:
void setMultiHighlightGradient(ColorGradient *gradient);
ColorGradient *multiHighlightGradient() const;
-public slots:
+public Q_SLOTS:
void handleBaseGradientUpdate();
void handleSingleHighlightGradientUpdate();
void handleMultiHighlightGradientUpdate();
-signals:
+Q_SIGNALS:
void selectedBarChanged(QPointF position);
void baseGradientChanged(ColorGradient *gradient);
void singleHighlightGradientChanged(ColorGradient *gradient);
@@ -120,12 +120,12 @@ public:
int invalidSelectionIndex() const;
-public slots:
+public Q_SLOTS:
void handleBaseGradientUpdate();
void handleSingleHighlightGradientUpdate();
void handleMultiHighlightGradientUpdate();
-signals:
+Q_SIGNALS:
void baseGradientChanged(ColorGradient *gradient);
void singleHighlightGradientChanged(ColorGradient *gradient);
void multiHighlightGradientChanged(ColorGradient *gradient);
@@ -168,12 +168,12 @@ public:
void setMultiHighlightGradient(ColorGradient *gradient);
ColorGradient *multiHighlightGradient() const;
-public slots:
+public Q_SLOTS:
void handleBaseGradientUpdate();
void handleSingleHighlightGradientUpdate();
void handleMultiHighlightGradientUpdate();
-signals:
+Q_SIGNALS:
void selectedPointChanged(QPointF position);
void baseGradientChanged(ColorGradient *gradient);
void singleHighlightGradientChanged(ColorGradient *gradient);
diff --git a/src/datavisualizationqml2/declarativesurface_p.h b/src/datavisualizationqml2/declarativesurface_p.h
index a72c3f1c..0c745606 100644
--- a/src/datavisualizationqml2/declarativesurface_p.h
+++ b/src/datavisualizationqml2/declarativesurface_p.h
@@ -70,12 +70,12 @@ public:
void setFlipHorizontalGrid(bool flip);
bool flipHorizontalGrid() const;
-public slots:
+public Q_SLOTS:
void handleAxisXChanged(QAbstract3DAxis *axis);
void handleAxisYChanged(QAbstract3DAxis *axis);
void handleAxisZChanged(QAbstract3DAxis *axis);
-signals:
+Q_SIGNALS:
void axisXChanged(QValue3DAxis *axis);
void axisYChanged(QValue3DAxis *axis);
void axisZChanged(QValue3DAxis *axis);
diff --git a/src/datavisualizationqml2/declarativetheme_p.h b/src/datavisualizationqml2/declarativetheme_p.h
index b84e5b49..8df3f52c 100644
--- a/src/datavisualizationqml2/declarativetheme_p.h
+++ b/src/datavisualizationqml2/declarativetheme_p.h
@@ -80,7 +80,7 @@ public:
virtual void classBegin();
virtual void componentComplete();
-signals:
+Q_SIGNALS:
void singleHighlightGradientChanged(ColorGradient *gradient);
void multiHighlightGradientChanged(ColorGradient *gradient);