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

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

Removes test_private form qmake, adds chaeck in soruce file of private tests
Michal Klocek -
r1977:0c7165b201ff
parent child
Show More
Side by Side Unified
Context file:
r1977:0c7165b201ff Loading diff...:
Show file before | Show file after | Hide comments
@@ -97,7 +97,6 coverage: CONFIG += debug
97 ##################### UNIT TESTS ##############################################################
97 ##################### UNIT TESTS ##############################################################
98
98
99 CONFIG(debug, debug|release) {
99 CONFIG(debug, debug|release) {
100 CONFIG+=test_private
101 DEFINES+=BUILD_PRIVATE_UNIT_TESTS
100 DEFINES+=BUILD_PRIVATE_UNIT_TESTS
102 }
101 }
103
102
Show file before | Show file after | Hide comments
@@ -22,13 +22,14 SUBDIRS += \
22 qhorizontalpercentbarseries \
22 qhorizontalpercentbarseries \
23 qvalueaxis \
23 qvalueaxis \
24 qcategoryaxis \
24 qcategoryaxis \
25 qbarcategoryaxis
25 qbarcategoryaxis \
26 domain \
27 chartdataset
26
28
27 !linux-arm*: {
29 !linux-arm*: {
28 SUBDIRS += \
30 SUBDIRS += \
29 qdatetimeaxis
31 qdatetimeaxis
30 }
32 }
31
33
32 test_private:{
34
33 SUBDIRS += domain chartdataset
35
34 }
Show file before | Show file after | Hide comments
@@ -17,6 +17,27
17 ** $QT_END_LICENSE$
17 ** $QT_END_LICENSE$
18 **
18 **
19 ****************************************************************************/
19 ****************************************************************************/
20 #ifndef BUILD_PRIVATE_UNIT_TESTS
21 #include <QtTest/QtTest>
22
23 class tst_ChartDataSet: public QObject {
24
25 Q_OBJECT
26
27 private Q_SLOTS:
28 void skip();
29
30 };
31
32 void tst_ChartDataSet::skip()
33 {
34 QSKIP("This test requires the debug version of library", SkipAll);
35 }
36
37 QTEST_MAIN(tst_ChartDataSet)
38 #include "tst_chartdataset.moc"
39
40 #else
20
41
21 #include <QtTest/QtTest>
42 #include <QtTest/QtTest>
22 #include <qabstractaxis.h>
43 #include <qabstractaxis.h>
@@ -620,4 +641,4 void tst_ChartDataSet::scrollDomain()
620
641
621 QTEST_MAIN(tst_ChartDataSet)
642 QTEST_MAIN(tst_ChartDataSet)
622 #include "tst_chartdataset.moc"
643 #include "tst_chartdataset.moc"
623
644 #endif
Show file before | Show file after | Hide comments
@@ -1,4 +1,5
1 !include( ../auto.pri ) {
1 !include( ../auto.pri ) {
2 error( "Couldn't find the auto.pri file!" )
2 error( "Couldn't find the auto.pri file!" )
3 }
3 }
4
4 SOURCES += tst_domain.cpp
5 SOURCES += tst_domain.cpp
Show file before | Show file after | Hide comments
@@ -17,6 +17,28
17 ** $QT_END_LICENSE$
17 ** $QT_END_LICENSE$
18 **
18 **
19 ****************************************************************************/
19 ****************************************************************************/
20 #ifndef BUILD_PRIVATE_UNIT_TESTS
21
22 #include <QtTest/QtTest>
23
24 class tst_Domain: public QObject {
25
26 Q_OBJECT
27
28 private Q_SLOTS:
29 void skip();
30
31 };
32
33 void tst_Domain::skip()
34 {
35 QSKIP("This test requires the debug version of library", SkipAll);
36 }
37
38 QTEST_MAIN(tst_Domain)
39 #include "tst_domain.moc"
40
41 #else
20
42
21 #include <QtTest/QtTest>
43 #include <QtTest/QtTest>
22 #include <private/domain_p.h>
44 #include <private/domain_p.h>
@@ -678,4 +700,4 void tst_Domain::move()
678
700
679 QTEST_MAIN(tst_Domain)
701 QTEST_MAIN(tst_Domain)
680 #include "tst_domain.moc"
702 #include "tst_domain.moc"
681
703 #endif
General Comments 0
You need to be logged in to leave comments. Login now