##// END OF EJS Templates
Fix build against 5.6...
Miikka Heikkinen -
r2793:f83d776d3813
parent child
Show More
@@ -34,7 +34,7 class DataSource : public QObject
34 34 public:
35 35 explicit DataSource(QQuickView *appViewer, QObject *parent = 0);
36 36
37 signals:
37 Q_SIGNALS:
38 38
39 39 public slots:
40 40 void generateData(int type, int rowCount, int colCount);
@@ -48,7 +48,7 QString QChartsPlugin::includeFile() const
48 48 QString myNewLine = QStringLiteral("\n");
49 49 #endif
50 50 return QStringLiteral("<QtCharts/QChartView>") + myNewLine
51 + QStringLiteral("#include <chartsnamespace.h>");
51 + QStringLiteral("#include <QtCharts/chartsnamespace.h>");
52 52 }
53 53
54 54 QString QChartsPlugin::group() const
@@ -41,7 +41,7 class BarChartItem : public AbstractBarChartItem
41 41 public:
42 42 BarChartItem(QAbstractBarSeries *series, QGraphicsItem* item = 0);
43 43
44 private slots:
44 private Q_SLOTS:
45 45 void handleLabelsPositionChanged();
46 46 void positionLabels();
47 47
@@ -43,7 +43,7 public:
43 43 PercentBarChartItem(QAbstractBarSeries *series, QGraphicsItem* item = 0);
44 44 void handleUpdatedBars();
45 45
46 private slots:
46 private Q_SLOTS:
47 47 void handleLabelsPositionChanged();
48 48 void positionLabels();
49 49
@@ -41,7 +41,7 class StackedBarChartItem : public AbstractBarChartItem
41 41 public:
42 42 StackedBarChartItem(QAbstractBarSeries *series, QGraphicsItem* item =0);
43 43
44 private slots:
44 private Q_SLOTS:
45 45 void handleLabelsPositionChanged();
46 46 void positionLabels();
47 47
@@ -79,7 +79,7 Q_SIGNALS:
79 79 void updatedLayout();
80 80 void restructuredBoxes();
81 81
82 private slots:
82 private Q_SLOTS:
83 83 void handleSeriesChange(QAbstractSeries *series);
84 84 void handleSeriesRemove(QAbstractSeries *series);
85 85
@@ -167,7 +167,7 public Q_SLOTS:
167 167 void handleAxisAdded(QAbstractAxis *axis);
168 168 void handleAxisRemoved(QAbstractAxis *axis);
169 169
170 signals:
170 Q_SIGNALS:
171 171 void plotAreaChanged(const QRectF &plotArea);
172 172
173 173 private:
@@ -21,6 +21,9
21 21
22 22 // this is needed by the designer plugin.
23 23
24 #ifdef QT_CHARTS_USE_NAMESPACE
24 25 QT_CHARTS_USE_NAMESPACE
26 #endif
27
25 28
26 29 #endif /* CHARTSNAMESPACE_H */
@@ -58,7 +58,7 public:
58 58
59 59 static QPieSeriesPrivate *fromSeries(QPieSeries *series);
60 60
61 signals:
61 Q_SIGNALS:
62 62 void calculatedDataChanged();
63 63 void pieSizeChanged();
64 64 void pieStartAngleChanged();
@@ -160,7 +160,7 public:
160 160
161 161 ChartType chartType() const;
162 162
163 signals:
163 Q_SIGNALS:
164 164 void plotAreaChanged(const QRectF &plotArea);
165 165
166 166 protected:
@@ -52,7 +52,7 public:
52 52 void emitAxisXTopChanged() { emit axisXTopChanged(m_axisXTop); }
53 53 void emitAxisYRightChanged() { emit axisYRightChanged(m_axisYRight); }
54 54
55 signals:
55 Q_SIGNALS:
56 56 void axisXChanged(QAbstractAxis *axis);
57 57 void axisYChanged(QAbstractAxis *axis);
58 58 void axisXTopChanged(QAbstractAxis *axis);
General Comments 0
You need to be logged in to leave comments. Login now