##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » USERS » JEANDET » qtcharts
RSS

Clone from http://code.qt.io/qt/qtcharts.git

build fix.
sauimone -
r744:4a4cc4b22b41
parent child
Show More
Show file before | Show file after | Hide comments
@@ -1,41 +1,39
1 1 #ifndef QSCATTERSERIES_H
2 2 #define QSCATTERSERIES_H
3 3
4 4 #include <qchartglobal.h>
5 5 #include <qxyseries.h>
6 #include <QRectF>
7 #include <QColor>
8 6
9 7 QTCOMMERCIALCHART_BEGIN_NAMESPACE
10 8 class QScatterSeriesPrivate;
11 9
12 10 class QTCOMMERCIALCHART_EXPORT QScatterSeries : public QXYSeries
13 11 {
14 12
15 13 public:
16 14 enum MarkerShape {
17 15 MarkerShapeCircle,
18 16 MarkerShapeRectangle
19 17 };
20 18
21 19 public:
22 20 QScatterSeries(QObject *parent = 0);
23 21 ~QScatterSeries();
24 22
25 23 public: // from QChartSeries
26 24 QSeriesType type() const { return QSeries::SeriesTypeScatter; }
27 25
28 26 public:
29 27 MarkerShape shape() const;
30 28 void setShape(MarkerShape shape);
31 29 qreal size() const;
32 30 void setSize(qreal size);
33 31
34 32 private:
35 33 MarkerShape m_shape;
36 34 qreal m_size;
37 35 };
38 36
39 37 QTCOMMERCIALCHART_END_NAMESPACE
40 38
41 39 #endif // QSCATTERSERIES_H
Show file before | Show file after | Hide comments
@@ -1,158 +1,158
1 1 !include( ../common.pri ):error( Couldn't find the common.pri file! )
2 2 TARGET = QtCommercialChart
3 3 DESTDIR = $$CHART_BUILD_LIB_DIR
4 4 TEMPLATE = lib
5 5 QT += core \
6 6 gui
7 7 win32-msvc*: LIBS += User32.lib
8 8 CONFIG += debug_and_release
9 9 CONFIG(debug, debug|release):TARGET = QtCommercialChartd
10 10 SOURCES += \
11 11 $$PWD/chartdataset.cpp \
12 12 $$PWD/chartpresenter.cpp \
13 13 $$PWD/charttheme.cpp \
14 14 $$PWD/domain.cpp \
15 15 $$PWD/qchart.cpp \
16 16 $$PWD/qchartview.cpp \
17 17 $$PWD/qseries.cpp \
18 18 $$PWD/qlegend.cpp \
19 19 $$PWD/legendmarker.cpp \
20 20 $$PWD/legendscrollbutton.cpp \
21 21 $$PWD/chartbackground.cpp \
22 22 $$PWD/chart.cpp
23 23 PRIVATE_HEADERS += \
24 24 $$PWD/chartdataset_p.h \
25 25 $$PWD/chartitem_p.h \
26 26 $$PWD/chartpresenter_p.h \
27 27 $$PWD/charttheme_p.h \
28 28 $$PWD/domain_p.h \
29 29 $$PWD/legendmarker_p.h \
30 30 $$PWD/legendscrollbutton_p.h \
31 31 $$PWD/chartbackground_p.h \
32 32 $$PWD/chart_p.h \
33 33 $$PWD/chartconfig_p.h \
34 34 $$PWD/qchart_p.h
35 35 PUBLIC_HEADERS += \
36 36 $$PWD/qchart.h \
37 37 $$PWD/qchartglobal.h \
38 38 $$PWD/qseries.h \
39 39 $$PWD/qchartview.h \
40 40 $$PWD/qlegend.h
41 41
42 42 include(animations/animations.pri)
43 43 include(axis/axis.pri)
44 44 include(xychart/xychart.pri)
45 45 include(linechart/linechart.pri)
46 46 include(areachart/areachart.pri)
47 47 include(barchart/barchart.pri)
48 48 include(piechart/piechart.pri)
49 49 include(scatterseries/scatter.pri)
50 50 include(splinechart/splinechart.pri)
51 51 include(themes/themes.pri)
52 52
53 53
54 54 HEADERS += $$PUBLIC_HEADERS
55 55 HEADERS += $$PRIVATE_HEADERS
56 56 HEADERS += $$THEMES
57 INCLUDEPATH += ../include
57 INCLUDEPATH += ../include .
58 58
59 59 OBJECTS_DIR = $$CHART_BUILD_DIR/lib
60 60 MOC_DIR = $$CHART_BUILD_DIR/lib
61 61 UI_DIR = $$CHART_BUILD_DIR/lib
62 62 RCC_DIR = $$CHART_BUILD_DIR/lib
63 63 DEFINES += QTCOMMERCIALCHART_LIBRARY
64 64
65 65 #qt public headers
66 66 #this is very primitive and lame parser , TODO: make perl script insted
67 67 !exists($$CHART_BUILD_PUBLIC_HEADER_DIR/QChartGlobal)
68 68 {
69 69 system($$QMAKE_MKDIR $$CHART_BUILD_PUBLIC_HEADER_DIR)
70 70 win32:{
71 71 command = "echo $${LITERAL_HASH}include \"qchartglobal.h\" > $$CHART_BUILD_PUBLIC_HEADER_DIR/QChartGlobal"
72 72 }else{
73 73 command = "echo \"$${LITERAL_HASH}include \\\"qchartglobal.h\\\"\" > $$CHART_BUILD_PUBLIC_HEADER_DIR/QChartGlobal"
74 74 }
75 75 system($$command)
76 76 }
77 77
78 78 for(file, PUBLIC_HEADERS) {
79 79 name = $$split(file,'/')
80 80 name = $$last(name)
81 81 class = "$$cat($$file)"
82 82 class = $$find(class,class)
83 83 !isEmpty(class){
84 84 class = $$split(class,QTCOMMERCIALCHART_EXPORT)
85 85 class = $$member(class,1)
86 86 class = $$split(class,' ')
87 87 class = $$replace(class,' ','')
88 88 class = $$member(class,0)
89 89 win32:{
90 90 command = "echo $${LITERAL_HASH}include \"$$name\" > $$CHART_BUILD_PUBLIC_HEADER_DIR/$$class"
91 91 }else{
92 92 command = "echo \"$${LITERAL_HASH}include \\\"$$name\\\"\" > $$CHART_BUILD_PUBLIC_HEADER_DIR/$$class"
93 93 }
94 94 PUBLIC_QT_HEADERS += $$CHART_BUILD_PUBLIC_HEADER_DIR/$$class
95 95 system($$command)
96 96 }
97 97 }
98 98
99 99 public_headers.path = $$[QT_INSTALL_HEADERS]/QtCommercialChart
100 100 public_headers.files = $$PUBLIC_HEADERS $$PUBLIC_QT_HEADERS
101 101
102 102 target.path = $$[QT_INSTALL_LIBS]
103 103 INSTALLS += target public_headers
104 104
105 105 install_build_public_headers.name = build_public_headers
106 106 install_build_public_headers.output = $$CHART_BUILD_PUBLIC_HEADER_DIR/${QMAKE_FILE_BASE}.h
107 107 install_build_public_headers.input = PUBLIC_HEADERS
108 108 install_build_public_headers.commands = $$QMAKE_COPY \
109 109 ${QMAKE_FILE_NAME} \
110 110 $$CHART_BUILD_PUBLIC_HEADER_DIR
111 111 install_build_public_headers.CONFIG += target_predeps \
112 112 no_link
113 113
114 114 install_build_private_headers.name = buld_private_headers
115 115 install_build_private_headers.output = $$CHART_BUILD_PRIVATE_HEADER_DIR/${QMAKE_FILE_BASE}.h
116 116 install_build_private_headers.input = PRIVATE_HEADERS
117 117 install_build_private_headers.commands = $$QMAKE_COPY \
118 118 ${QMAKE_FILE_NAME} \
119 119 $$CHART_BUILD_PRIVATE_HEADER_DIR
120 120 install_build_private_headers.CONFIG += target_predeps \
121 121 no_link
122 122
123 123 QMAKE_EXTRA_COMPILERS += install_build_public_headers \
124 124 install_build_private_headers \
125 125
126 126
127 127 chartversion.target = $$PWD/qchartversion_p.h
128 128 unix:{
129 129 chartversion.commands = @echo \
130 130 "const char *buildTime = \\\"`date +'%y%m%d%H%M'`\\\" \\; \
131 131 const char *gitHead = \\\"`git rev-parse HEAD`\\\" \\; " \
132 132 > \
133 133 $$chartversion.target;
134 134 }else{
135 135 chartversion.commands = @echo \
136 136 "const char *buildTime = \"%date%_%time%\" ; \
137 137 const char *gitHead = \"unknown\" ; " \
138 138 > \
139 139 $$chartversion.target
140 140 }
141 141 chartversion.depends = $$HEADERS \
142 142 $$SOURCES
143 143 PRE_TARGETDEPS += $$PWD/qchartversion_p.h
144 144 QMAKE_CLEAN += $$PWD/qchartversion_p.h
145 145 QMAKE_EXTRA_TARGETS += chartversion
146 146 unix:QMAKE_DISTCLEAN += -r \
147 147 $$CHART_BUILD_HEADER_DIR \
148 148 $$CHART_BUILD_LIB_DIR
149 149 win32:QMAKE_DISTCLEAN += /Q \
150 150 $$CHART_BUILD_HEADER_DIR \
151 151 $$CHART_BUILD_LIB_DIR
152 152
153 153 # treat warnings as errors
154 154 win32-msvc*: {
155 155 QMAKE_CXXFLAGS += /WX
156 156 } else {
157 157 QMAKE_CXXFLAGS += -Werror
158 158 }
General Comments 0
You need to be logged in to leave comments. Login now