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

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

charts: Follow Qt's already-existent -developer-build option....
Robin Burchell -
r2855:aa5aba329d30
parent child
Show More
Side by Side Unified
Context file:
r2855:aa5aba329d30 Loading diff...:
Show file before | Show file after | Hide comments
@@ -57,7 +57,7 class QAbstractSeries;
57 57 class ChartTheme;
58 58 class ChartElement;
59 59
60 class QT_CHARTS_AUTOTEST_EXPORT QAbstractAxisPrivate : public QObject
60 class Q_AUTOTEST_EXPORT QAbstractAxisPrivate : public QObject
61 61 {
62 62 Q_OBJECT
63 63 public:
Show file before | Show file after | Hide comments
@@ -50,7 +50,7 class QAbstractAxis;
50 50 class ChartPresenter;
51 51 class GLXYSeriesDataManager;
52 52
53 class QT_CHARTS_AUTOTEST_EXPORT ChartDataSet : public QObject
53 class Q_AUTOTEST_EXPORT ChartDataSet : public QObject
54 54 {
55 55 Q_OBJECT
56 56 public:
Show file before | Show file after | Hide comments
@@ -84,11 +84,6 OTHER_FILES += doc/qtcharts.qdocconf \
84 84 doc/src/* \
85 85 doc/images/*
86 86
87 #Define for unit tests
88 CONFIG(debug, debug|release) {
89 DEFINES += BUILD_PRIVATE_UNIT_TESTS
90 }
91
92 87 msvc {
93 88 # Suppress "conversion from 'size_t' to 'int', possible loss of data" warnings in 64bit
94 89 # builds resulting from usage of str::sort
Show file before | Show file after | Hide comments
@@ -234,7 +234,7 bool AbstractDomain::detachAxis(QAbstractAxis *axis)
234 234
235 235 // operators
236 236
237 bool QT_CHARTS_AUTOTEST_EXPORT operator== (const AbstractDomain &domain1, const AbstractDomain &domain2)
237 bool Q_AUTOTEST_EXPORT operator== (const AbstractDomain &domain1, const AbstractDomain &domain2)
238 238 {
239 239 return (qFuzzyIsNull(domain1.m_maxX - domain2.m_maxX)
240 240 && qFuzzyIsNull(domain1.m_maxY - domain2.m_maxY)
@@ -243,13 +243,13 bool QT_CHARTS_AUTOTEST_EXPORT operator== (const AbstractDomain &domain1, const
243 243 }
244 244
245 245
246 bool QT_CHARTS_AUTOTEST_EXPORT operator!= (const AbstractDomain &domain1, const AbstractDomain &domain2)
246 bool Q_AUTOTEST_EXPORT operator!= (const AbstractDomain &domain1, const AbstractDomain &domain2)
247 247 {
248 248 return !(domain1 == domain2);
249 249 }
250 250
251 251
252 QDebug QT_CHARTS_AUTOTEST_EXPORT operator<<(QDebug dbg, const AbstractDomain &domain)
252 QDebug Q_AUTOTEST_EXPORT operator<<(QDebug dbg, const AbstractDomain &domain)
253 253 {
254 254 #ifdef QT_NO_TEXTSTREAM
255 255 Q_UNUSED(domain)
Show file before | Show file after | Hide comments
@@ -47,7 +47,7 QT_CHARTS_BEGIN_NAMESPACE
47 47
48 48 class QAbstractAxis;
49 49
50 class QT_CHARTS_AUTOTEST_EXPORT AbstractDomain: public QObject
50 class Q_AUTOTEST_EXPORT AbstractDomain: public QObject
51 51 {
52 52 Q_OBJECT
53 53 public:
@@ -93,9 +93,9 public:
93 93 void storeZoomReset();
94 94 bool isZoomed() { return m_zoomed; }
95 95
96 friend bool QT_CHARTS_AUTOTEST_EXPORT operator== (const AbstractDomain &domain1, const AbstractDomain &domain2);
97 friend bool QT_CHARTS_AUTOTEST_EXPORT operator!= (const AbstractDomain &domain1, const AbstractDomain &domain2);
98 friend QDebug QT_CHARTS_AUTOTEST_EXPORT operator<<(QDebug dbg, const AbstractDomain &domain);
96 friend bool Q_AUTOTEST_EXPORT operator== (const AbstractDomain &domain1, const AbstractDomain &domain2);
97 friend bool Q_AUTOTEST_EXPORT operator!= (const AbstractDomain &domain1, const AbstractDomain &domain2);
98 friend QDebug Q_AUTOTEST_EXPORT operator<<(QDebug dbg, const AbstractDomain &domain);
99 99
100 100 virtual void zoomIn(const QRectF &rect) = 0;
101 101 virtual void zoomOut(const QRectF &rect) = 0;
Show file before | Show file after | Hide comments
@@ -258,7 +258,7 void LogXLogYDomain::handleHorizontalAxisBaseChanged(qreal baseX)
258 258
259 259 // operators
260 260
261 bool QT_CHARTS_AUTOTEST_EXPORT operator== (const LogXLogYDomain &domain1, const LogXLogYDomain &domain2)
261 bool Q_AUTOTEST_EXPORT operator== (const LogXLogYDomain &domain1, const LogXLogYDomain &domain2)
262 262 {
263 263 return (qFuzzyIsNull(domain1.m_maxX - domain2.m_maxX)
264 264 && qFuzzyIsNull(domain1.m_maxY - domain2.m_maxY)
@@ -267,13 +267,13 bool QT_CHARTS_AUTOTEST_EXPORT operator== (const LogXLogYDomain &domain1, const
267 267 }
268 268
269 269
270 bool QT_CHARTS_AUTOTEST_EXPORT operator!= (const LogXLogYDomain &domain1, const LogXLogYDomain &domain2)
270 bool Q_AUTOTEST_EXPORT operator!= (const LogXLogYDomain &domain1, const LogXLogYDomain &domain2)
271 271 {
272 272 return !(domain1 == domain2);
273 273 }
274 274
275 275
276 QDebug QT_CHARTS_AUTOTEST_EXPORT operator<<(QDebug dbg, const LogXLogYDomain &domain)
276 QDebug Q_AUTOTEST_EXPORT operator<<(QDebug dbg, const LogXLogYDomain &domain)
277 277 {
278 278 #ifdef QT_NO_TEXTSTREAM
279 279 Q_UNUSED(domain)
Show file before | Show file after | Hide comments
@@ -44,7 +44,7
44 44
45 45 QT_CHARTS_BEGIN_NAMESPACE
46 46
47 class QT_CHARTS_AUTOTEST_EXPORT LogXLogYDomain: public AbstractDomain
47 class Q_AUTOTEST_EXPORT LogXLogYDomain: public AbstractDomain
48 48 {
49 49 Q_OBJECT
50 50 public:
@@ -55,9 +55,9 public:
55 55
56 56 void setRange(qreal minX, qreal maxX, qreal minY, qreal maxY);
57 57
58 friend bool QT_CHARTS_AUTOTEST_EXPORT operator== (const LogXLogYDomain &domain1, const LogXLogYDomain &domain2);
59 friend bool QT_CHARTS_AUTOTEST_EXPORT operator!= (const LogXLogYDomain &domain1, const LogXLogYDomain &domain2);
60 friend QDebug QT_CHARTS_AUTOTEST_EXPORT operator<<(QDebug dbg, const LogXLogYDomain &domain);
58 friend bool Q_AUTOTEST_EXPORT operator== (const LogXLogYDomain &domain1, const LogXLogYDomain &domain2);
59 friend bool Q_AUTOTEST_EXPORT operator!= (const LogXLogYDomain &domain1, const LogXLogYDomain &domain2);
60 friend QDebug Q_AUTOTEST_EXPORT operator<<(QDebug dbg, const LogXLogYDomain &domain);
61 61
62 62 void zoomIn(const QRectF &rect);
63 63 void zoomOut(const QRectF &rect);
Show file before | Show file after | Hide comments
@@ -253,7 +253,7 void LogXLogYPolarDomain::handleVerticalAxisBaseChanged(qreal baseY)
253 253
254 254 // operators
255 255
256 bool QT_CHARTS_AUTOTEST_EXPORT operator== (const LogXLogYPolarDomain &domain1, const LogXLogYPolarDomain &domain2)
256 bool Q_AUTOTEST_EXPORT operator== (const LogXLogYPolarDomain &domain1, const LogXLogYPolarDomain &domain2)
257 257 {
258 258 return (qFuzzyIsNull(domain1.m_maxX - domain2.m_maxX)
259 259 && qFuzzyIsNull(domain1.m_maxY - domain2.m_maxY)
@@ -262,13 +262,13 bool QT_CHARTS_AUTOTEST_EXPORT operator== (const LogXLogYPolarDomain &domain1, c
262 262 }
263 263
264 264
265 bool QT_CHARTS_AUTOTEST_EXPORT operator!= (const LogXLogYPolarDomain &domain1, const LogXLogYPolarDomain &domain2)
265 bool Q_AUTOTEST_EXPORT operator!= (const LogXLogYPolarDomain &domain1, const LogXLogYPolarDomain &domain2)
266 266 {
267 267 return !(domain1 == domain2);
268 268 }
269 269
270 270
271 QDebug QT_CHARTS_AUTOTEST_EXPORT operator<<(QDebug dbg, const LogXLogYPolarDomain &domain)
271 QDebug Q_AUTOTEST_EXPORT operator<<(QDebug dbg, const LogXLogYPolarDomain &domain)
272 272 {
273 273 #ifdef QT_NO_TEXTSTREAM
274 274 Q_UNUSED(domain)
Show file before | Show file after | Hide comments
@@ -44,7 +44,7
44 44
45 45 QT_CHARTS_BEGIN_NAMESPACE
46 46
47 class QT_CHARTS_AUTOTEST_EXPORT LogXLogYPolarDomain: public PolarDomain
47 class Q_AUTOTEST_EXPORT LogXLogYPolarDomain: public PolarDomain
48 48 {
49 49 Q_OBJECT
50 50 public:
@@ -55,9 +55,9 public:
55 55
56 56 void setRange(qreal minX, qreal maxX, qreal minY, qreal maxY);
57 57
58 friend bool QT_CHARTS_AUTOTEST_EXPORT operator== (const LogXLogYPolarDomain &domain1, const LogXLogYPolarDomain &domain2);
59 friend bool QT_CHARTS_AUTOTEST_EXPORT operator!= (const LogXLogYPolarDomain &domain1, const LogXLogYPolarDomain &domain2);
60 friend QDebug QT_CHARTS_AUTOTEST_EXPORT operator<<(QDebug dbg, const LogXLogYPolarDomain &domain);
58 friend bool Q_AUTOTEST_EXPORT operator== (const LogXLogYPolarDomain &domain1, const LogXLogYPolarDomain &domain2);
59 friend bool Q_AUTOTEST_EXPORT operator!= (const LogXLogYPolarDomain &domain1, const LogXLogYPolarDomain &domain2);
60 friend QDebug Q_AUTOTEST_EXPORT operator<<(QDebug dbg, const LogXLogYPolarDomain &domain);
61 61
62 62 void zoomIn(const QRectF &rect);
63 63 void zoomOut(const QRectF &rect);
Show file before | Show file after | Hide comments
@@ -225,7 +225,7 void LogXYDomain::handleHorizontalAxisBaseChanged(qreal baseX)
225 225
226 226 // operators
227 227
228 bool QT_CHARTS_AUTOTEST_EXPORT operator== (const LogXYDomain &domain1, const LogXYDomain &domain2)
228 bool Q_AUTOTEST_EXPORT operator== (const LogXYDomain &domain1, const LogXYDomain &domain2)
229 229 {
230 230 return (qFuzzyIsNull(domain1.m_maxX - domain2.m_maxX)
231 231 && qFuzzyIsNull(domain1.m_maxY - domain2.m_maxY)
@@ -234,13 +234,13 bool QT_CHARTS_AUTOTEST_EXPORT operator== (const LogXYDomain &domain1, const Log
234 234 }
235 235
236 236
237 bool QT_CHARTS_AUTOTEST_EXPORT operator!= (const LogXYDomain &domain1, const LogXYDomain &domain2)
237 bool Q_AUTOTEST_EXPORT operator!= (const LogXYDomain &domain1, const LogXYDomain &domain2)
238 238 {
239 239 return !(domain1 == domain2);
240 240 }
241 241
242 242
243 QDebug QT_CHARTS_AUTOTEST_EXPORT operator<<(QDebug dbg, const LogXYDomain &domain)
243 QDebug Q_AUTOTEST_EXPORT operator<<(QDebug dbg, const LogXYDomain &domain)
244 244 {
245 245 #ifdef QT_NO_TEXTSTREAM
246 246 Q_UNUSED(domain)
Show file before | Show file after | Hide comments
@@ -44,7 +44,7
44 44
45 45 QT_CHARTS_BEGIN_NAMESPACE
46 46
47 class QT_CHARTS_AUTOTEST_EXPORT LogXYDomain: public AbstractDomain
47 class Q_AUTOTEST_EXPORT LogXYDomain: public AbstractDomain
48 48 {
49 49 Q_OBJECT
50 50 public:
@@ -55,9 +55,9 public:
55 55
56 56 void setRange(qreal minX, qreal maxX, qreal minY, qreal maxY);
57 57
58 friend bool QT_CHARTS_AUTOTEST_EXPORT operator== (const LogXYDomain &domain1, const LogXYDomain &domain2);
59 friend bool QT_CHARTS_AUTOTEST_EXPORT operator!= (const LogXYDomain &domain1, const LogXYDomain &domain2);
60 friend QDebug QT_CHARTS_AUTOTEST_EXPORT operator<<(QDebug dbg, const LogXYDomain &domain);
58 friend bool Q_AUTOTEST_EXPORT operator== (const LogXYDomain &domain1, const LogXYDomain &domain2);
59 friend bool Q_AUTOTEST_EXPORT operator!= (const LogXYDomain &domain1, const LogXYDomain &domain2);
60 friend QDebug Q_AUTOTEST_EXPORT operator<<(QDebug dbg, const LogXYDomain &domain);
61 61
62 62 void zoomIn(const QRectF &rect);
63 63 void zoomOut(const QRectF &rect);
Show file before | Show file after | Hide comments
@@ -222,7 +222,7 void LogXYPolarDomain::handleHorizontalAxisBaseChanged(qreal baseX)
222 222
223 223 // operators
224 224
225 bool QT_CHARTS_AUTOTEST_EXPORT operator== (const LogXYPolarDomain &domain1, const LogXYPolarDomain &domain2)
225 bool Q_AUTOTEST_EXPORT operator== (const LogXYPolarDomain &domain1, const LogXYPolarDomain &domain2)
226 226 {
227 227 return (qFuzzyIsNull(domain1.m_maxX - domain2.m_maxX)
228 228 && qFuzzyIsNull(domain1.m_maxY - domain2.m_maxY)
@@ -231,13 +231,13 bool QT_CHARTS_AUTOTEST_EXPORT operator== (const LogXYPolarDomain &domain1, cons
231 231 }
232 232
233 233
234 bool QT_CHARTS_AUTOTEST_EXPORT operator!= (const LogXYPolarDomain &domain1, const LogXYPolarDomain &domain2)
234 bool Q_AUTOTEST_EXPORT operator!= (const LogXYPolarDomain &domain1, const LogXYPolarDomain &domain2)
235 235 {
236 236 return !(domain1 == domain2);
237 237 }
238 238
239 239
240 QDebug QT_CHARTS_AUTOTEST_EXPORT operator<<(QDebug dbg, const LogXYPolarDomain &domain)
240 QDebug Q_AUTOTEST_EXPORT operator<<(QDebug dbg, const LogXYPolarDomain &domain)
241 241 {
242 242 #ifdef QT_NO_TEXTSTREAM
243 243 Q_UNUSED(domain)
Show file before | Show file after | Hide comments
@@ -44,7 +44,7
44 44
45 45 QT_CHARTS_BEGIN_NAMESPACE
46 46
47 class QT_CHARTS_AUTOTEST_EXPORT LogXYPolarDomain: public PolarDomain
47 class Q_AUTOTEST_EXPORT LogXYPolarDomain: public PolarDomain
48 48 {
49 49 Q_OBJECT
50 50 public:
@@ -55,9 +55,9 public:
55 55
56 56 void setRange(qreal minX, qreal maxX, qreal minY, qreal maxY);
57 57
58 friend bool QT_CHARTS_AUTOTEST_EXPORT operator== (const LogXYPolarDomain &domain1, const LogXYPolarDomain &domain2);
59 friend bool QT_CHARTS_AUTOTEST_EXPORT operator!= (const LogXYPolarDomain &domain1, const LogXYPolarDomain &domain2);
60 friend QDebug QT_CHARTS_AUTOTEST_EXPORT operator<<(QDebug dbg, const LogXYPolarDomain &domain);
58 friend bool Q_AUTOTEST_EXPORT operator== (const LogXYPolarDomain &domain1, const LogXYPolarDomain &domain2);
59 friend bool Q_AUTOTEST_EXPORT operator!= (const LogXYPolarDomain &domain1, const LogXYPolarDomain &domain2);
60 friend QDebug Q_AUTOTEST_EXPORT operator<<(QDebug dbg, const LogXYPolarDomain &domain);
61 61
62 62 void zoomIn(const QRectF &rect);
63 63 void zoomOut(const QRectF &rect);
Show file before | Show file after | Hide comments
@@ -44,7 +44,7
44 44
45 45 QT_CHARTS_BEGIN_NAMESPACE
46 46
47 class QT_CHARTS_AUTOTEST_EXPORT PolarDomain: public AbstractDomain
47 class Q_AUTOTEST_EXPORT PolarDomain: public AbstractDomain
48 48 {
49 49 Q_OBJECT
50 50 public:
Show file before | Show file after | Hide comments
@@ -221,7 +221,7 void XLogYDomain::handleVerticalAxisBaseChanged(qreal baseY)
221 221
222 222 // operators
223 223
224 bool QT_CHARTS_AUTOTEST_EXPORT operator== (const XLogYDomain &domain1, const XLogYDomain &domain2)
224 bool Q_AUTOTEST_EXPORT operator== (const XLogYDomain &domain1, const XLogYDomain &domain2)
225 225 {
226 226 return (qFuzzyIsNull(domain1.m_maxX - domain2.m_maxX)
227 227 && qFuzzyIsNull(domain1.m_maxY - domain2.m_maxY)
@@ -230,13 +230,13 bool QT_CHARTS_AUTOTEST_EXPORT operator== (const XLogYDomain &domain1, const XLo
230 230 }
231 231
232 232
233 bool QT_CHARTS_AUTOTEST_EXPORT operator!= (const XLogYDomain &domain1, const XLogYDomain &domain2)
233 bool Q_AUTOTEST_EXPORT operator!= (const XLogYDomain &domain1, const XLogYDomain &domain2)
234 234 {
235 235 return !(domain1 == domain2);
236 236 }
237 237
238 238
239 QDebug QT_CHARTS_AUTOTEST_EXPORT operator<<(QDebug dbg, const XLogYDomain &domain)
239 QDebug Q_AUTOTEST_EXPORT operator<<(QDebug dbg, const XLogYDomain &domain)
240 240 {
241 241 #ifdef QT_NO_TEXTSTREAM
242 242 Q_UNUSED(domain)
Show file before | Show file after | Hide comments
@@ -44,7 +44,7
44 44
45 45 QT_CHARTS_BEGIN_NAMESPACE
46 46
47 class QT_CHARTS_AUTOTEST_EXPORT XLogYDomain: public AbstractDomain
47 class Q_AUTOTEST_EXPORT XLogYDomain: public AbstractDomain
48 48 {
49 49 Q_OBJECT
50 50 public:
@@ -55,9 +55,9 public:
55 55
56 56 void setRange(qreal minX, qreal maxX, qreal minY, qreal maxY);
57 57
58 friend bool QT_CHARTS_AUTOTEST_EXPORT operator== (const XLogYDomain &domain1, const XLogYDomain &domain2);
59 friend bool QT_CHARTS_AUTOTEST_EXPORT operator!= (const XLogYDomain &domain1, const XLogYDomain &domain2);
60 friend QDebug QT_CHARTS_AUTOTEST_EXPORT operator<<(QDebug dbg, const XLogYDomain &domain);
58 friend bool Q_AUTOTEST_EXPORT operator== (const XLogYDomain &domain1, const XLogYDomain &domain2);
59 friend bool Q_AUTOTEST_EXPORT operator!= (const XLogYDomain &domain1, const XLogYDomain &domain2);
60 friend QDebug Q_AUTOTEST_EXPORT operator<<(QDebug dbg, const XLogYDomain &domain);
61 61
62 62 void zoomIn(const QRectF &rect);
63 63 void zoomOut(const QRectF &rect);
Show file before | Show file after | Hide comments
@@ -217,7 +217,7 void XLogYPolarDomain::handleVerticalAxisBaseChanged(qreal baseY)
217 217
218 218 // operators
219 219
220 bool QT_CHARTS_AUTOTEST_EXPORT operator== (const XLogYPolarDomain &domain1, const XLogYPolarDomain &domain2)
220 bool Q_AUTOTEST_EXPORT operator== (const XLogYPolarDomain &domain1, const XLogYPolarDomain &domain2)
221 221 {
222 222 return (qFuzzyIsNull(domain1.m_maxX - domain2.m_maxX)
223 223 && qFuzzyIsNull(domain1.m_maxY - domain2.m_maxY)
@@ -226,13 +226,13 bool QT_CHARTS_AUTOTEST_EXPORT operator== (const XLogYPolarDomain &domain1, cons
226 226 }
227 227
228 228
229 bool QT_CHARTS_AUTOTEST_EXPORT operator!= (const XLogYPolarDomain &domain1, const XLogYPolarDomain &domain2)
229 bool Q_AUTOTEST_EXPORT operator!= (const XLogYPolarDomain &domain1, const XLogYPolarDomain &domain2)
230 230 {
231 231 return !(domain1 == domain2);
232 232 }
233 233
234 234
235 QDebug QT_CHARTS_AUTOTEST_EXPORT operator<<(QDebug dbg, const XLogYPolarDomain &domain)
235 QDebug Q_AUTOTEST_EXPORT operator<<(QDebug dbg, const XLogYPolarDomain &domain)
236 236 {
237 237 #ifdef QT_NO_TEXTSTREAM
238 238 Q_UNUSED(domain)
Show file before | Show file after | Hide comments
@@ -44,7 +44,7
44 44
45 45 QT_CHARTS_BEGIN_NAMESPACE
46 46
47 class QT_CHARTS_AUTOTEST_EXPORT XLogYPolarDomain: public PolarDomain
47 class Q_AUTOTEST_EXPORT XLogYPolarDomain: public PolarDomain
48 48 {
49 49 Q_OBJECT
50 50 public:
@@ -55,9 +55,9 public:
55 55
56 56 void setRange(qreal minX, qreal maxX, qreal minY, qreal maxY);
57 57
58 friend bool QT_CHARTS_AUTOTEST_EXPORT operator== (const XLogYPolarDomain &domain1, const XLogYPolarDomain &domain2);
59 friend bool QT_CHARTS_AUTOTEST_EXPORT operator!= (const XLogYPolarDomain &domain1, const XLogYPolarDomain &domain2);
60 friend QDebug QT_CHARTS_AUTOTEST_EXPORT operator<<(QDebug dbg, const XLogYPolarDomain &domain);
58 friend bool Q_AUTOTEST_EXPORT operator== (const XLogYPolarDomain &domain1, const XLogYPolarDomain &domain2);
59 friend bool Q_AUTOTEST_EXPORT operator!= (const XLogYPolarDomain &domain1, const XLogYPolarDomain &domain2);
60 friend QDebug Q_AUTOTEST_EXPORT operator<<(QDebug dbg, const XLogYPolarDomain &domain);
61 61
62 62 void zoomIn(const QRectF &rect);
63 63 void zoomOut(const QRectF &rect);
Show file before | Show file after | Hide comments
@@ -183,7 +183,7 QPointF XYDomain::calculateDomainPoint(const QPointF &point) const
183 183
184 184 // operators
185 185
186 bool QT_CHARTS_AUTOTEST_EXPORT operator== (const XYDomain &domain1, const XYDomain &domain2)
186 bool Q_AUTOTEST_EXPORT operator== (const XYDomain &domain1, const XYDomain &domain2)
187 187 {
188 188 return (qFuzzyCompare(domain1.m_maxX, domain2.m_maxX)
189 189 && qFuzzyCompare(domain1.m_maxY, domain2.m_maxY)
@@ -192,13 +192,13 bool QT_CHARTS_AUTOTEST_EXPORT operator== (const XYDomain &domain1, const XYDoma
192 192 }
193 193
194 194
195 bool QT_CHARTS_AUTOTEST_EXPORT operator!= (const XYDomain &domain1, const XYDomain &domain2)
195 bool Q_AUTOTEST_EXPORT operator!= (const XYDomain &domain1, const XYDomain &domain2)
196 196 {
197 197 return !(domain1 == domain2);
198 198 }
199 199
200 200
201 QDebug QT_CHARTS_AUTOTEST_EXPORT operator<<(QDebug dbg, const XYDomain &domain)
201 QDebug Q_AUTOTEST_EXPORT operator<<(QDebug dbg, const XYDomain &domain)
202 202 {
203 203 #ifdef QT_NO_TEXTSTREAM
204 204 Q_UNUSED(domain)
Show file before | Show file after | Hide comments
@@ -44,7 +44,7
44 44
45 45 QT_CHARTS_BEGIN_NAMESPACE
46 46
47 class QT_CHARTS_AUTOTEST_EXPORT XYDomain: public AbstractDomain
47 class Q_AUTOTEST_EXPORT XYDomain: public AbstractDomain
48 48 {
49 49 Q_OBJECT
50 50 public:
@@ -55,9 +55,9 public:
55 55
56 56 void setRange(qreal minX, qreal maxX, qreal minY, qreal maxY);
57 57
58 friend bool QT_CHARTS_AUTOTEST_EXPORT operator== (const XYDomain &Domain1, const XYDomain &Domain2);
59 friend bool QT_CHARTS_AUTOTEST_EXPORT operator!= (const XYDomain &Domain1, const XYDomain &Domain2);
60 friend QDebug QT_CHARTS_AUTOTEST_EXPORT operator<<(QDebug dbg, const XYDomain &AbstractDomain);
58 friend bool Q_AUTOTEST_EXPORT operator== (const XYDomain &Domain1, const XYDomain &Domain2);
59 friend bool Q_AUTOTEST_EXPORT operator!= (const XYDomain &Domain1, const XYDomain &Domain2);
60 friend QDebug Q_AUTOTEST_EXPORT operator<<(QDebug dbg, const XYDomain &AbstractDomain);
61 61
62 62 void zoomIn(const QRectF &rect);
63 63 void zoomOut(const QRectF &rect);
Show file before | Show file after | Hide comments
@@ -163,7 +163,7 qreal XYPolarDomain::toRadialCoordinate(qreal value, bool &ok) const
163 163
164 164 // operators
165 165
166 bool QT_CHARTS_AUTOTEST_EXPORT operator== (const XYPolarDomain &domain1, const XYPolarDomain &domain2)
166 bool Q_AUTOTEST_EXPORT operator== (const XYPolarDomain &domain1, const XYPolarDomain &domain2)
167 167 {
168 168 return (qFuzzyCompare(domain1.m_maxX, domain2.m_maxX)
169 169 && qFuzzyCompare(domain1.m_maxY, domain2.m_maxY)
@@ -172,13 +172,13 bool QT_CHARTS_AUTOTEST_EXPORT operator== (const XYPolarDomain &domain1, const X
172 172 }
173 173
174 174
175 bool QT_CHARTS_AUTOTEST_EXPORT operator!= (const XYPolarDomain &domain1, const XYPolarDomain &domain2)
175 bool Q_AUTOTEST_EXPORT operator!= (const XYPolarDomain &domain1, const XYPolarDomain &domain2)
176 176 {
177 177 return !(domain1 == domain2);
178 178 }
179 179
180 180
181 QDebug QT_CHARTS_AUTOTEST_EXPORT operator<<(QDebug dbg, const XYPolarDomain &domain)
181 QDebug Q_AUTOTEST_EXPORT operator<<(QDebug dbg, const XYPolarDomain &domain)
182 182 {
183 183 #ifdef QT_NO_TEXTSTREAM
184 184 Q_UNUSED(domain)
Show file before | Show file after | Hide comments
@@ -43,7 +43,7
43 43
44 44 QT_CHARTS_BEGIN_NAMESPACE
45 45
46 class QT_CHARTS_AUTOTEST_EXPORT XYPolarDomain: public PolarDomain
46 class Q_AUTOTEST_EXPORT XYPolarDomain: public PolarDomain
47 47 {
48 48 Q_OBJECT
49 49 public:
@@ -54,9 +54,9 public:
54 54
55 55 void setRange(qreal minX, qreal maxX, qreal minY, qreal maxY);
56 56
57 friend bool QT_CHARTS_AUTOTEST_EXPORT operator== (const XYPolarDomain &Domain1, const XYPolarDomain &Domain2);
58 friend bool QT_CHARTS_AUTOTEST_EXPORT operator!= (const XYPolarDomain &Domain1, const XYPolarDomain &Domain2);
59 friend QDebug QT_CHARTS_AUTOTEST_EXPORT operator<<(QDebug dbg, const XYPolarDomain &AbstractDomain);
57 friend bool Q_AUTOTEST_EXPORT operator== (const XYPolarDomain &Domain1, const XYPolarDomain &Domain2);
58 friend bool Q_AUTOTEST_EXPORT operator!= (const XYPolarDomain &Domain1, const XYPolarDomain &Domain2);
59 friend QDebug Q_AUTOTEST_EXPORT operator<<(QDebug dbg, const XYPolarDomain &AbstractDomain);
60 60
61 61 void zoomIn(const QRectF &rect);
62 62 void zoomOut(const QRectF &rect);
Show file before | Show file after | Hide comments
@@ -48,19 +48,11
48 48 # define QT_CHARTS_EXPORT Q_DECL_IMPORT
49 49 #endif
50 50
51 #if defined(BUILD_PRIVATE_UNIT_TESTS) && defined(QT_CHARTS_LIBRARY)
52 # define QT_CHARTS_AUTOTEST_EXPORT Q_DECL_EXPORT
53 #elif defined(BUILD_PRIVATE_UNIT_TESTS) && !defined(QT_CHARTS_LIBRARY)
54 # define QT_CHARTS_AUTOTEST_EXPORT Q_DECL_IMPORT
55 #else
56 # define QT_CHARTS_AUTOTEST_EXPORT
57 #endif
58
59 51 #ifdef QT_CHARTS_STATICLIB
60 52 # undef QT_CHARTS_EXPORT
61 # undef QT_CHARTS_AUTOTEST_EXPORT
53 # undef Q_AUTOTEST_EXPORT
62 54 # define QT_CHARTS_EXPORT
63 # define QT_CHARTS_AUTOTEST_EXPORT
55 # define Q_AUTOTEST_EXPORT
64 56 #endif
65 57
66 58 #define QT_CHARTS_NAMESPACE QtCharts
Show file before | Show file after | Hide comments
@@ -8,8 +8,3 QT += testlib widgets
8 8
9 9 INCLUDEPATH += ../inc
10 10 HEADERS += ../inc/tst_definitions.h
11
12 #Define for unit tests
13 CONFIG(debug, debug|release) {
14 DEFINES += BUILD_PRIVATE_UNIT_TESTS
15 }
Show file before | Show file after | Hide comments
@@ -34,3 +34,8 qtHaveModule(quick) {
34 34 SUBDIRS += qml \
35 35 qml-qtquicktest
36 36 }
37
38 !contains(QT_CONFIG, private_tests): SUBDIRS -= \
39 domain \
40 chartdataset
41
Show file before | Show file after | Hide comments
@@ -26,27 +26,6
26 26 ** $QT_END_LICENSE$
27 27 **
28 28 ****************************************************************************/
29 #ifndef BUILD_PRIVATE_UNIT_TESTS
30 #include <QtTest/QtTest>
31
32 class tst_ChartDataSet: public QObject {
33
34 Q_OBJECT
35
36 private Q_SLOTS:
37 void skip();
38
39 };
40
41 void tst_ChartDataSet::skip()
42 {
43 QSKIP("This test requires the debug version of library");
44 }
45
46 QTEST_MAIN(tst_ChartDataSet)
47 #include "tst_chartdataset.moc"
48
49 #else
50 29
51 30 #include <QtTest/QtTest>
52 31 #include <QtCharts/QAbstractAxis>
@@ -404,4 +383,3 void tst_ChartDataSet::detachAxis()
404 383
405 384 QTEST_MAIN(tst_ChartDataSet)
406 385 #include "tst_chartdataset.moc"
407 #endif
Show file before | Show file after | Hide comments
@@ -26,29 +26,6
26 26 ** $QT_END_LICENSE$
27 27 **
28 28 ****************************************************************************/
29 #ifndef BUILD_PRIVATE_UNIT_TESTS
30
31 #include <QtTest/QtTest>
32
33 class tst_Domain: public QObject {
34
35 Q_OBJECT
36
37 private Q_SLOTS:
38 void skip();
39
40 };
41
42 void tst_Domain::skip()
43 {
44 QSKIP("This test requires the debug version of library");
45 }
46
47 QTEST_MAIN(tst_Domain)
48 #include "tst_domain.moc"
49
50 #else
51
52 29 #include <QtTest/QtTest>
53 30 #include <private/xydomain_p.h>
54 31 #include <private/qabstractaxis_p.h>
@@ -753,4 +730,3 void tst_Domain::move()
753 730
754 731 QTEST_MAIN(tst_Domain)
755 732 #include "tst_domain.moc"
756 #endif
General Comments 0
You need to be logged in to leave comments. Login now