summaryrefslogtreecommitdiffstats
path: root/tests/manual
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2020-12-04 13:47:51 +0100
committerMichal Klocek <michal.klocek@qt.io>2020-12-08 13:49:27 +0000
commit1393b587d3b23877602d84cd49489ff033190875 (patch)
tree91cc9bc1aa91da982f4c216a0f99082215ce0ee9 /tests/manual
parent22af8117ffa31a6fc5ab7ec4d7d0fc00a72cc616 (diff)
Do not use include with error, prepare for cmake
Reporting errors for every single include does not make so much sense and it complicates cmake port (adds a need for lot of extra #special case). Change-Id: I42cf4d7366798caaba5fd6729691051909a5a0c1 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'tests/manual')
-rw-r--r--tests/manual/boxplottester/boxplottester.pro5
-rw-r--r--tests/manual/candlesticktester/candlesticktester.pro4
-rw-r--r--tests/manual/chartdesigner/chartdesigner.pro8
-rw-r--r--tests/manual/chartviewer/chartviewer.pro4
-rw-r--r--tests/manual/chartwidgettest/chartwidgettest.pro5
-rw-r--r--tests/manual/openglseriestest/openglseriestest.pro5
-rw-r--r--tests/manual/polarcharttest/polarcharttest.pro5
-rw-r--r--tests/manual/presenterchart/presenterchart.pro4
-rw-r--r--tests/manual/qmlchartaxis/qmlchartaxis.pro4
-rw-r--r--tests/manual/qmlchartproperties/qmlchartproperties.pro5
-rw-r--r--tests/manual/wavechart/wavechart.pro5
11 files changed, 12 insertions, 42 deletions
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