diff options
43 files changed, 44 insertions, 145 deletions
diff --git a/tests/auto/auto.pri b/tests/auto/auto.pri index 946b0e4a..a0efd72c 100644 --- a/tests/auto/auto.pri +++ b/tests/auto/auto.pri @@ -1,6 +1,4 @@ -!include( ../tests.pri ) { - error( "Couldn't find the tests.pri file!" ) -} +include( ../tests.pri ) CONFIG += testcase QT += testlib widgets diff --git a/tests/auto/chartdataset/chartdataset.pro b/tests/auto/chartdataset/chartdataset.pro index 22307d02..1704713b 100644 --- a/tests/auto/chartdataset/chartdataset.pro +++ b/tests/auto/chartdataset/chartdataset.pro @@ -1,6 +1,4 @@ -!include( ../auto.pri ) { - error( "Couldn't find the auto.pri file!" ) -} +include( ../auto.pri ) QT += charts-private core-private diff --git a/tests/auto/domain/domain.pro b/tests/auto/domain/domain.pro index 4eebe20e..43996eb6 100644 --- a/tests/auto/domain/domain.pro +++ b/tests/auto/domain/domain.pro @@ -1,7 +1,4 @@ -!include( ../auto.pri ) { - error( "Couldn't find the auto.pri file!" ) -} - +include( ../auto.pri ) QT += charts-private core-private SOURCES += tst_domain.cpp diff --git a/tests/auto/qareaseries/qareaseries.pro b/tests/auto/qareaseries/qareaseries.pro index a87857ab..751755c0 100644 --- a/tests/auto/qareaseries/qareaseries.pro +++ b/tests/auto/qareaseries/qareaseries.pro @@ -1,4 +1,2 @@ -!include( ../auto.pri ) { - error( "Couldn't find the auto.pri file!" ) -} +include( ../auto.pri ) SOURCES += tst_qareaseries.cpp diff --git a/tests/auto/qbarcategoryaxis/qbarcategoryaxis.pro b/tests/auto/qbarcategoryaxis/qbarcategoryaxis.pro index b80424af..aab80f67 100644 --- a/tests/auto/qbarcategoryaxis/qbarcategoryaxis.pro +++ b/tests/auto/qbarcategoryaxis/qbarcategoryaxis.pro @@ -1,5 +1,3 @@ -!include( ../auto.pri ) { - error( "Couldn't find the auto.pri file!" ) -} +include( ../auto.pri ) HEADERS += ../qabstractaxis/tst_qabstractaxis.h SOURCES += tst_qbarcategoryaxis.cpp ../qabstractaxis/tst_qabstractaxis.cpp diff --git a/tests/auto/qbarmodelmapper/qbarmodelmapper.pro b/tests/auto/qbarmodelmapper/qbarmodelmapper.pro index 6a15bc67..fce09450 100644 --- a/tests/auto/qbarmodelmapper/qbarmodelmapper.pro +++ b/tests/auto/qbarmodelmapper/qbarmodelmapper.pro @@ -1,6 +1,3 @@ -!include( ../auto.pri ) { - error( "Couldn't find the auto.pri file!" ) -} - +include( ../auto.pri ) SOURCES += \ tst_qbarmodelmapper.cpp diff --git a/tests/auto/qbarseries/qbarseries.pro b/tests/auto/qbarseries/qbarseries.pro index ec5d64cb..573f21a9 100644 --- a/tests/auto/qbarseries/qbarseries.pro +++ b/tests/auto/qbarseries/qbarseries.pro @@ -1,4 +1,2 @@ -!include( ../auto.pri ) { - error( "Couldn't find the auto.pri file!" ) -} +include( ../auto.pri ) SOURCES += tst_qbarseries.cpp diff --git a/tests/auto/qbarset/qbarset.pro b/tests/auto/qbarset/qbarset.pro index 2436301f..405260cb 100644 --- a/tests/auto/qbarset/qbarset.pro +++ b/tests/auto/qbarset/qbarset.pro @@ -1,4 +1,2 @@ -!include( ../auto.pri ) { - error( "Couldn't find the auto.pri file!" ) -} +include( ../auto.pri ) SOURCES += tst_qbarset.cpp diff --git a/tests/auto/qcandlestickmodelmapper/qcandlestickmodelmapper.pro b/tests/auto/qcandlestickmodelmapper/qcandlestickmodelmapper.pro index 81f0b368..bd80da03 100644 --- a/tests/auto/qcandlestickmodelmapper/qcandlestickmodelmapper.pro +++ b/tests/auto/qcandlestickmodelmapper/qcandlestickmodelmapper.pro @@ -1,5 +1,2 @@ -!include( ../auto.pri ) { - error( "Couldn't find the auto.pri file!" ) -} - +include( ../auto.pri ) SOURCES += tst_qcandlestickmodelmapper.cpp diff --git a/tests/auto/qcandlestickseries/qcandlestickseries.pro b/tests/auto/qcandlestickseries/qcandlestickseries.pro index ccaa2e25..e2b9b9ef 100644 --- a/tests/auto/qcandlestickseries/qcandlestickseries.pro +++ b/tests/auto/qcandlestickseries/qcandlestickseries.pro @@ -1,5 +1,2 @@ -!include( ../auto.pri ) { - error( "Couldn't find the auto.pri file!" ) -} - +include( ../auto.pri ) SOURCES += tst_qcandlestickseries.cpp diff --git a/tests/auto/qcandlestickset/qcandlestickset.pro b/tests/auto/qcandlestickset/qcandlestickset.pro index e67d1df8..8ce54941 100644 --- a/tests/auto/qcandlestickset/qcandlestickset.pro +++ b/tests/auto/qcandlestickset/qcandlestickset.pro @@ -1,5 +1,2 @@ -!include( ../auto.pri ) { - error( "Couldn't find the auto.pri file!" ) -} - +include( ../auto.pri ) SOURCES += tst_qcandlestickset.cpp diff --git a/tests/auto/qcategoryaxis/qcategoryaxis.pro b/tests/auto/qcategoryaxis/qcategoryaxis.pro index 3f662bbc..0359e53b 100644 --- a/tests/auto/qcategoryaxis/qcategoryaxis.pro +++ b/tests/auto/qcategoryaxis/qcategoryaxis.pro @@ -1,5 +1,3 @@ -!include( ../auto.pri ) { - error( "Couldn't find the auto.pri file!" ) -} +include( ../auto.pri ) HEADERS += ../qabstractaxis/tst_qabstractaxis.h SOURCES += tst_qcategoryaxis.cpp ../qabstractaxis/tst_qabstractaxis.cpp diff --git a/tests/auto/qchart/qchart.pro b/tests/auto/qchart/qchart.pro index 53f67375..d8f70791 100644 --- a/tests/auto/qchart/qchart.pro +++ b/tests/auto/qchart/qchart.pro @@ -1,4 +1,2 @@ -!include( ../auto.pri ) { - error( "Couldn't find the auto.pri file!" ) -} +include( ../auto.pri ) SOURCES += tst_qchart.cpp diff --git a/tests/auto/qchartview/qchartview.pro b/tests/auto/qchartview/qchartview.pro index 1cc04dbc..190ff869 100644 --- a/tests/auto/qchartview/qchartview.pro +++ b/tests/auto/qchartview/qchartview.pro @@ -1,4 +1,2 @@ -!include( ../auto.pri ) { - error( "Couldn't find the auto.pri file!" ) -} +include( ../auto.pri ) SOURCES += tst_qchartview.cpp diff --git a/tests/auto/qdatetimeaxis/qdatetimeaxis.pro b/tests/auto/qdatetimeaxis/qdatetimeaxis.pro index ea34c143..43ecced3 100644 --- a/tests/auto/qdatetimeaxis/qdatetimeaxis.pro +++ b/tests/auto/qdatetimeaxis/qdatetimeaxis.pro @@ -1,5 +1,3 @@ -!include( ../auto.pri ) { - error( "Couldn't find the auto.pri file!" ) -} +include( ../auto.pri ) HEADERS += ../qabstractaxis/tst_qabstractaxis.h SOURCES += tst_qdatetimeaxis.cpp ../qabstractaxis/tst_qabstractaxis.cpp diff --git a/tests/auto/qhorizontalbarseries/qhorizontalbarseries.pro b/tests/auto/qhorizontalbarseries/qhorizontalbarseries.pro index b26460a9..05d2f0e4 100644 --- a/tests/auto/qhorizontalbarseries/qhorizontalbarseries.pro +++ b/tests/auto/qhorizontalbarseries/qhorizontalbarseries.pro @@ -1,4 +1,2 @@ -!include( ../auto.pri ) { - error( "Couldn't find the auto.pri file!" ) -} +include( ../auto.pri ) SOURCES += tst_qhorizontalbarseries.cpp diff --git a/tests/auto/qhorizontalpercentbarseries/qhorizontalpercentbarseries.pro b/tests/auto/qhorizontalpercentbarseries/qhorizontalpercentbarseries.pro index ff0a832c..4bf62f46 100644 --- a/tests/auto/qhorizontalpercentbarseries/qhorizontalpercentbarseries.pro +++ b/tests/auto/qhorizontalpercentbarseries/qhorizontalpercentbarseries.pro @@ -1,4 +1,2 @@ -!include( ../auto.pri ) { - error( "Couldn't find the auto.pri file!" ) -} +include( ../auto.pri ) SOURCES += tst_qhorizontalpercentbarseries.cpp diff --git a/tests/auto/qhorizontalstackedbarseries/qhorizontalstackedbarseries.pro b/tests/auto/qhorizontalstackedbarseries/qhorizontalstackedbarseries.pro index 84179cc5..dc730616 100644 --- a/tests/auto/qhorizontalstackedbarseries/qhorizontalstackedbarseries.pro +++ b/tests/auto/qhorizontalstackedbarseries/qhorizontalstackedbarseries.pro @@ -1,4 +1,2 @@ -!include( ../auto.pri ) { - error( "Couldn't find the auto.pri file!" ) -} +include( ../auto.pri ) SOURCES += tst_qhorizontalstackedbarseries.cpp diff --git a/tests/auto/qlegend/qlegend.pro b/tests/auto/qlegend/qlegend.pro index 26dbf50b..090b3dfc 100644 --- a/tests/auto/qlegend/qlegend.pro +++ b/tests/auto/qlegend/qlegend.pro @@ -1,4 +1,2 @@ -!include( ../auto.pri ) { - error( "Couldn't find the auto.pri file!" ) -} +include( ../auto.pri ) SOURCES += tst_qlegend.cpp diff --git a/tests/auto/qlineseries/qlineseries.pro b/tests/auto/qlineseries/qlineseries.pro index 855812ee..687495b1 100644 --- a/tests/auto/qlineseries/qlineseries.pro +++ b/tests/auto/qlineseries/qlineseries.pro @@ -1,5 +1,3 @@ -!include( ../auto.pri ) { - error( "Couldn't find the auto.pri file!" ) -} +include( ../auto.pri ) HEADERS += ../qxyseries/tst_qxyseries.h SOURCES += tst_qlineseries.cpp ../qxyseries/tst_qxyseries.cpp diff --git a/tests/auto/qlogvalueaxis/qlogvalueaxis.pro b/tests/auto/qlogvalueaxis/qlogvalueaxis.pro index e52567a9..8436aca8 100644 --- a/tests/auto/qlogvalueaxis/qlogvalueaxis.pro +++ b/tests/auto/qlogvalueaxis/qlogvalueaxis.pro @@ -1,5 +1,3 @@ -!include( ../auto.pri ) { - error( "Couldn't find the auto.pri file!" ) -} +include( ../auto.pri ) HEADERS += ../qabstractaxis/tst_qabstractaxis.h SOURCES += tst_qlogvalueaxis.cpp ../qabstractaxis/tst_qabstractaxis.cpp diff --git a/tests/auto/qml-qtquicktest/qml-qtquicktest.pro b/tests/auto/qml-qtquicktest/qml-qtquicktest.pro index d4919c1d..629608c4 100644 --- a/tests/auto/qml-qtquicktest/qml-qtquicktest.pro +++ b/tests/auto/qml-qtquicktest/qml-qtquicktest.pro @@ -1,7 +1,4 @@ -!include( ../auto.pri ) { - error( "Couldn't find the auto.pri file!" ) -} - +include( ../auto.pri ) TEMPLATE = app CONFIG += warn_on qmltestcase CONFIG -= testcase diff --git a/tests/auto/qml/qml.pro b/tests/auto/qml/qml.pro index f116195d..ec4fa1f0 100644 --- a/tests/auto/qml/qml.pro +++ b/tests/auto/qml/qml.pro @@ -1,5 +1,3 @@ -!include( ../auto.pri ) { - error( "Couldn't find the auto.pri file!" ) -} +include( ../auto.pri ) SOURCES += tst_qml.cpp QT += qml quick diff --git a/tests/auto/qpercentbarseries/qpercentbarseries.pro b/tests/auto/qpercentbarseries/qpercentbarseries.pro index e32360e3..6c1df8dc 100644 --- a/tests/auto/qpercentbarseries/qpercentbarseries.pro +++ b/tests/auto/qpercentbarseries/qpercentbarseries.pro @@ -1,4 +1,2 @@ -!include( ../auto.pri ) { - error( "Couldn't find the auto.pri file!" ) -} +include( ../auto.pri ) SOURCES += tst_qpercentbarseries.cpp diff --git a/tests/auto/qpiemodelmapper/qpiemodelmapper.pro b/tests/auto/qpiemodelmapper/qpiemodelmapper.pro index e03e2303..64d308e8 100644 --- a/tests/auto/qpiemodelmapper/qpiemodelmapper.pro +++ b/tests/auto/qpiemodelmapper/qpiemodelmapper.pro @@ -1,6 +1,3 @@ -!include( ../auto.pri ) { - error( "Couldn't find the auto.pri file!" ) -} - +include( ../auto.pri ) SOURCES += \ tst_qpiemodelmapper.cpp diff --git a/tests/auto/qpieseries/qpieseries.pro b/tests/auto/qpieseries/qpieseries.pro index 82a19f9e..c8db41d5 100644 --- a/tests/auto/qpieseries/qpieseries.pro +++ b/tests/auto/qpieseries/qpieseries.pro @@ -1,4 +1,2 @@ -!include( ../auto.pri ) { - error( "Couldn't find the auto.pri file!" ) -} +include( ../auto.pri ) SOURCES += tst_qpieseries.cpp diff --git a/tests/auto/qpieslice/qpieslice.pro b/tests/auto/qpieslice/qpieslice.pro index 3c8c5a02..c966d06e 100644 --- a/tests/auto/qpieslice/qpieslice.pro +++ b/tests/auto/qpieslice/qpieslice.pro @@ -1,4 +1,2 @@ -!include( ../auto.pri ) { - error( "Couldn't find the auto.pri file!" ) -} +include( ../auto.pri ) SOURCES += tst_qpieslice.cpp diff --git a/tests/auto/qscatterseries/qscatterseries.pro b/tests/auto/qscatterseries/qscatterseries.pro index 8144798a..b3f0f38e 100644 --- a/tests/auto/qscatterseries/qscatterseries.pro +++ b/tests/auto/qscatterseries/qscatterseries.pro @@ -1,4 +1,3 @@ -!include( ../auto.pri ):error( "Couldn't find the auto.pri file!" ) - +include( ../auto.pri ) HEADERS += ../qxyseries/tst_qxyseries.h SOURCES += tst_qscatterseries.cpp ../qxyseries/tst_qxyseries.cpp diff --git a/tests/auto/qsplineseries/qsplineseries.pro b/tests/auto/qsplineseries/qsplineseries.pro index 7d5d1797..d4a6aa91 100644 --- a/tests/auto/qsplineseries/qsplineseries.pro +++ b/tests/auto/qsplineseries/qsplineseries.pro @@ -1,5 +1,3 @@ -!include( ../auto.pri ) { - error( "Couldn't find the auto.pri file!" ) -} +include( ../auto.pri ) HEADERS += ../qxyseries/tst_qxyseries.h SOURCES += tst_qsplineseries.cpp ../qxyseries/tst_qxyseries.cpp diff --git a/tests/auto/qstackedbarseries/qstackedbarseries.pro b/tests/auto/qstackedbarseries/qstackedbarseries.pro index 0852d15d..27c5f9cf 100644 --- a/tests/auto/qstackedbarseries/qstackedbarseries.pro +++ b/tests/auto/qstackedbarseries/qstackedbarseries.pro @@ -1,4 +1,2 @@ -!include( ../auto.pri ) { - error( "Couldn't find the auto.pri file!" ) -} +include( ../auto.pri ) SOURCES += tst_qstackedbarseries.cpp diff --git a/tests/auto/qvalueaxis/qvalueaxis.pro b/tests/auto/qvalueaxis/qvalueaxis.pro index 315a8a6e..77d9686e 100644 --- a/tests/auto/qvalueaxis/qvalueaxis.pro +++ b/tests/auto/qvalueaxis/qvalueaxis.pro @@ -1,5 +1,3 @@ -!include( ../auto.pri ) { - error( "Couldn't find the auto.pri file!" ) -} +include( ../auto.pri ) HEADERS += ../qabstractaxis/tst_qabstractaxis.h SOURCES += tst_qvalueaxis.cpp ../qabstractaxis/tst_qabstractaxis.cpp diff --git a/tests/auto/qxymodelmapper/qxymodelmapper.pro b/tests/auto/qxymodelmapper/qxymodelmapper.pro index 4b3647af..c1906624 100644 --- a/tests/auto/qxymodelmapper/qxymodelmapper.pro +++ b/tests/auto/qxymodelmapper/qxymodelmapper.pro @@ -1,6 +1,3 @@ -!include( ../auto.pri ) { - error( "Couldn't find the auto.pri file!" ) -} - +include( ../auto.pri ) SOURCES += \ tst_qxymodelmapper.cpp diff --git a/tests/manual/boxplottester/boxplottester.pro b/tests/manual/boxplottester/boxplottester.pro index 1a8681fe..dc8a7e1c 100644 --- a/tests/manual/boxplottester/boxplottester.pro +++ b/tests/manual/boxplottester/boxplottester.pro @@ -1,7 +1,4 @@ -!include( ../../tests.pri ) { - error( "Couldn't find the test.pri file!" ) -} - +include( ../../tests.pri ) TEMPLATE = app QT += charts diff --git a/tests/manual/candlesticktester/candlesticktester.pro b/tests/manual/candlesticktester/candlesticktester.pro index fd927b6e..f8ec1c4f 100644 --- a/tests/manual/candlesticktester/candlesticktester.pro +++ b/tests/manual/candlesticktester/candlesticktester.pro @@ -1,6 +1,4 @@ -!include( ../../tests.pri ) { - error( "Couldn't find the test.pri file!" ) -} +include( ../../tests.pri ) QT += widgets diff --git a/tests/manual/chartdesigner/chartdesigner.pro b/tests/manual/chartdesigner/chartdesigner.pro index 32cf9157..10d0a4e2 100644 --- a/tests/manual/chartdesigner/chartdesigner.pro +++ b/tests/manual/chartdesigner/chartdesigner.pro @@ -1,12 +1,8 @@ -!include( ../../tests.pri ) { - error( "Couldn't find the test.pri file!" ) -} - -TEMPLATE = app +include( ../../tests.pri ) QT += core gui SOURCES += \ - brushwidget.cpp \ + brushwidget.cpp \ main.cpp \ mainwindow.cpp \ objectinspectorwidget.cpp \ diff --git a/tests/manual/chartviewer/chartviewer.pro b/tests/manual/chartviewer/chartviewer.pro index 19b35490..1da7c570 100644 --- a/tests/manual/chartviewer/chartviewer.pro +++ b/tests/manual/chartviewer/chartviewer.pro @@ -1,6 +1,4 @@ -!include( ../../tests.pri ) { - error( "Couldn't find the test.pri file!" ) -} +include( ../../tests.pri ) include(charts/charts.pri) TARGET = chartviewer INCLUDEPATH += . diff --git a/tests/manual/chartwidgettest/chartwidgettest.pro b/tests/manual/chartwidgettest/chartwidgettest.pro index 9140c64b..fef660d1 100644 --- a/tests/manual/chartwidgettest/chartwidgettest.pro +++ b/tests/manual/chartwidgettest/chartwidgettest.pro @@ -1,7 +1,4 @@ -!include( ../../tests.pri ) { - error( "Couldn't find the test.pri file!" ) -} - +include( ../../tests.pri ) TEMPLATE = app QT += core gui widgets diff --git a/tests/manual/openglseriestest/openglseriestest.pro b/tests/manual/openglseriestest/openglseriestest.pro index b874fd33..f943bf60 100644 --- a/tests/manual/openglseriestest/openglseriestest.pro +++ b/tests/manual/openglseriestest/openglseriestest.pro @@ -1,7 +1,4 @@ -!include( ../../tests.pri ) { - error( "Couldn't find the test.pri file!" ) -} - +include( ../../tests.pri ) QT += core gui widgets TARGET = openglseriestest diff --git a/tests/manual/polarcharttest/polarcharttest.pro b/tests/manual/polarcharttest/polarcharttest.pro index a8409769..0dcd2915 100644 --- a/tests/manual/polarcharttest/polarcharttest.pro +++ b/tests/manual/polarcharttest/polarcharttest.pro @@ -1,7 +1,4 @@ -!include( ../../tests.pri ) { - error( "Couldn't find the test.pri file!" ) -} - +include( ../../tests.pri ) QT += core gui widgets TARGET = polarcharttest diff --git a/tests/manual/presenterchart/presenterchart.pro b/tests/manual/presenterchart/presenterchart.pro index 0269c6e7..7b1272d8 100644 --- a/tests/manual/presenterchart/presenterchart.pro +++ b/tests/manual/presenterchart/presenterchart.pro @@ -1,6 +1,4 @@ -!include( ../../tests.pri ) { - error( "Couldn't find the test.pri file!" ) -} +include( ../../tests.pri ) TARGET = presenterchart HEADERS += chartview.h diff --git a/tests/manual/qmlchartaxis/qmlchartaxis.pro b/tests/manual/qmlchartaxis/qmlchartaxis.pro index aaf2a7a0..305a36ad 100644 --- a/tests/manual/qmlchartaxis/qmlchartaxis.pro +++ b/tests/manual/qmlchartaxis/qmlchartaxis.pro @@ -1,6 +1,4 @@ -!include( ../../tests.pri ) { - error( "Couldn't find the test.pri file!" ) -} +include( ../../tests.pri ) RESOURCES += resources.qrc SOURCES += main.cpp diff --git a/tests/manual/qmlchartproperties/qmlchartproperties.pro b/tests/manual/qmlchartproperties/qmlchartproperties.pro index 78c19300..c720b775 100644 --- a/tests/manual/qmlchartproperties/qmlchartproperties.pro +++ b/tests/manual/qmlchartproperties/qmlchartproperties.pro @@ -1,7 +1,4 @@ -!include( ../../tests.pri ) { - error( "Couldn't find the test.pri file!" ) -} - +include( ../../tests.pri ) RESOURCES += resources.qrc SOURCES += main.cpp OTHER_FILES += qml/qmlchartproperties/* diff --git a/tests/manual/wavechart/wavechart.pro b/tests/manual/wavechart/wavechart.pro index da5c473d..7ead092a 100644 --- a/tests/manual/wavechart/wavechart.pro +++ b/tests/manual/wavechart/wavechart.pro @@ -1,7 +1,4 @@ -!include( ../../tests.pri ) { - error( "Couldn't find the test.pri file!" ) -} - +include( ../../tests.pri ) TARGET = wavechart SOURCES += main.cpp wavechart.cpp HEADERS += wavechart.h |