##// END OF EJS Templates
Removed unused DeclarativeSeries class
Tero Ahola -
r311:e1f0c8c24a70
parent child
Show More
@@ -11,8 +11,7 DeclarativeChart::DeclarativeChart(QDeclarativeItem *parent)
11
11
12 DeclarativeChart::ChartTheme DeclarativeChart::theme()
12 DeclarativeChart::ChartTheme DeclarativeChart::theme()
13 {
13 {
14 if (m_chart)
14 return (ChartTheme) m_chart->chartTheme();
15 return (ChartTheme) m_chart->chartTheme();
16 }
15 }
17
16
18 void DeclarativeChart::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
17 void DeclarativeChart::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
@@ -1,7 +1,6
1 #include <QtDeclarative/qdeclarativeextensionplugin.h>
1 #include <QtDeclarative/qdeclarativeextensionplugin.h>
2 #include <QtDeclarative/qdeclarative.h>
2 #include <QtDeclarative/qdeclarative.h>
3 #include "declarativechart.h"
3 #include "declarativechart.h"
4 #include "declarativeseries.h"
5 #include "scatterelement.h"
4 #include "scatterelement.h"
6 #include "declarativescatterseries.h"
5 #include "declarativescatterseries.h"
7 #include "declarativelineseries.h"
6 #include "declarativelineseries.h"
@@ -18,7 +17,6 public:
18 Q_ASSERT(QLatin1String(uri) == QLatin1String("QtCommercial.Chart"));
17 Q_ASSERT(QLatin1String(uri) == QLatin1String("QtCommercial.Chart"));
19
18
20 qmlRegisterType<DeclarativeChart>(uri, 1, 0, "Chart");
19 qmlRegisterType<DeclarativeChart>(uri, 1, 0, "Chart");
21 qmlRegisterType<DeclarativeSeries>(uri, 1, 0, "Series");
22 qmlRegisterType<DeclarativeScatterSeries>(uri, 1, 0, "ScatterSeries");
20 qmlRegisterType<DeclarativeScatterSeries>(uri, 1, 0, "ScatterSeries");
23 qmlRegisterType<DeclarativeLineSeries>(uri, 1, 0, "LineSeries");
21 qmlRegisterType<DeclarativeLineSeries>(uri, 1, 0, "LineSeries");
24 qmlRegisterType<DeclarativePieSeries>(uri, 1, 0, "PieSeries");
22 qmlRegisterType<DeclarativePieSeries>(uri, 1, 0, "PieSeries");
@@ -24,14 +24,12 RCC_DIR = $$CHART_BUILD_DIR/plugin
24 SOURCES += \
24 SOURCES += \
25 plugin.cpp \
25 plugin.cpp \
26 declarativechart.cpp \
26 declarativechart.cpp \
27 declarativeseries.cpp \
28 declarativescatterseries.cpp \
27 declarativescatterseries.cpp \
29 scatterelement.cpp \
28 scatterelement.cpp \
30 declarativepieseries.cpp \
29 declarativepieseries.cpp \
31 declarativelineseries.cpp
30 declarativelineseries.cpp
32 HEADERS += \
31 HEADERS += \
33 declarativechart.h \
32 declarativechart.h \
34 declarativeseries.h \
35 declarativescatterseries.h \
33 declarativescatterseries.h \
36 scatterelement.h \
34 scatterelement.h \
37 declarativepieseries.h \
35 declarativepieseries.h \
@@ -45,23 +43,3 qmldir.files += $$PWD/qmldir
45 qmldir.path += $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
43 qmldir.path += $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
46
44
47 INSTALLS += target qmldir
45 INSTALLS += target qmldir
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
General Comments 0
You need to be logged in to leave comments. Login now