| @@ -75,11 +75,6 OTHER_FILES += doc/qtcharts.qdocconf \ | |||
|
|
75 | 75 | doc/src/* \ |
|
|
76 | 76 | doc/images/* |
|
|
77 | 77 | |
|
|
78 | #Define for unit tests | |
|
|
79 | CONFIG(debug, debug|release) { | |
|
|
80 | DEFINES += BUILD_PRIVATE_UNIT_TESTS | |
|
|
81 | } | |
|
|
82 | ||
|
|
83 | 78 | msvc { |
|
|
84 | 79 | # Suppress "conversion from 'size_t' to 'int', possible loss of data" warnings in 64bit |
|
|
85 | 80 | # builds resulting from usage of str::sort |
| @@ -44,14 +44,7 | |||
|
|
44 | 44 | # define QT_CHARTS_EXPORT |
|
|
45 | 45 | #endif |
|
|
46 | 46 | |
|
|
47 | #if defined(BUILD_PRIVATE_UNIT_TESTS) && defined(QT_BUILD_CHARTS_LIB) | |
|
|
48 | # define QT_CHARTS_AUTOTEST_EXPORT Q_DECL_EXPORT | |
|
|
49 | #elif defined(BUILD_PRIVATE_UNIT_TESTS) && !defined(QT_BUILD_CHARTS_LIB) | |
|
|
50 | # define QT_CHARTS_AUTOTEST_EXPORT Q_DECL_IMPORT | |
|
|
51 | #else | |
|
|
52 | # define QT_CHARTS_AUTOTEST_EXPORT | |
|
|
53 | #endif | |
|
|
54 | ||
|
|
47 | #define QT_CHARTS_AUTOTEST_EXPORT Q_AUTOTEST_EXPORT | |
|
|
55 | 48 | |
|
|
56 | 49 | #define QT_CHARTS_NAMESPACE QtCharts |
|
|
57 | 50 | |
| @@ -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 | } | |
| @@ -18,7 +18,7 | |||
|
|
18 | 18 | ** $QT_END_LICENSE$ |
|
|
19 | 19 | ** |
|
|
20 | 20 | ******************************************************************************/ |
|
|
21 |
#ifndef BUILD_ |
|
|
|
21 | #ifndef QT_BUILD_INTERNAL | |
|
|
22 | 22 | #include <QtTest/QtTest> |
|
|
23 | 23 | |
|
|
24 | 24 | class tst_ChartDataSet: public QObject { |
| @@ -32,7 +32,7 private Q_SLOTS: | |||
|
|
32 | 32 | |
|
|
33 | 33 | void tst_ChartDataSet::skip() |
|
|
34 | 34 | { |
|
|
35 |
QSKIP("This test requires |
|
|
|
35 | QSKIP("This test requires a developer build of the library"); | |
|
|
36 | 36 | } |
|
|
37 | 37 | |
|
|
38 | 38 | QTEST_MAIN(tst_ChartDataSet) |
| @@ -18,7 +18,7 | |||
|
|
18 | 18 | ** $QT_END_LICENSE$ |
|
|
19 | 19 | ** |
|
|
20 | 20 | ******************************************************************************/ |
|
|
21 |
#ifndef BUILD_ |
|
|
|
21 | #ifndef QT_BUILD_INTERNAL | |
|
|
22 | 22 | |
|
|
23 | 23 | #include <QtTest/QtTest> |
|
|
24 | 24 | |
| @@ -33,7 +33,7 private Q_SLOTS: | |||
|
|
33 | 33 | |
|
|
34 | 34 | void tst_Domain::skip() |
|
|
35 | 35 | { |
|
|
36 |
QSKIP("This test requires |
|
|
|
36 | QSKIP("This test requires a developer build of the library"); | |
|
|
37 | 37 | } |
|
|
38 | 38 | |
|
|
39 | 39 | QTEST_MAIN(tst_Domain) |
General Comments 0
You need to be logged in to leave comments.
Login now