diff --git a/test/auto/auto.pri b/test/auto/auto.pri new file mode 100644 index 0000000..2347915 --- /dev/null +++ b/test/auto/auto.pri @@ -0,0 +1,17 @@ +!include( ../../common.pri ) { + error( "Couldn't find the common.pri file!" ) +} +!include( ../../integrated.pri ) { + error( "Couldn't find the integrated.pri file !") +} + +TEMPLATE = app +CONFIG += qtestlib + +DESTDIR = $$CHART_BUILD_BIN_DIR/test +OBJECTS_DIR = $$CHART_BUILD_DIR/test/$$TARGET +MOC_DIR = $$CHART_BUILD_DIR/test/$$TARGET +UI_DIR = $$CHART_BUILD_DIR/test/$$TARGET +RCC_DIR = $$CHART_BUILD_DIR/test/$$TARGET + +!contains(TARGET, ^tst_.*):TARGET = $$join(TARGET,,"tst_") diff --git a/test/auto/auto.pro b/test/auto/auto.pro index 2610bce..8df82c3 100644 --- a/test/auto/auto.pro +++ b/test/auto/auto.pro @@ -1,2 +1,2 @@ TEMPLATE = subdirs -SUBDIRS += chartdataset domain qchartview qchart \ No newline at end of file +SUBDIRS += chartdataset domain qchartview qchart diff --git a/test/auto/chartdataset/chartdataset.pro b/test/auto/chartdataset/chartdataset.pro index bf89a47..50edf53 100644 --- a/test/auto/chartdataset/chartdataset.pro +++ b/test/auto/chartdataset/chartdataset.pro @@ -1,4 +1,4 @@ -!include( ../../test.pri ) { - error( "Couldn't find the test.pri file!" ) +!include( ../auto.pri ) { + error( "Couldn't find the auto.pri file!" ) } SOURCES += tst_chartdataset.cpp diff --git a/test/auto/domain/domain.pro b/test/auto/domain/domain.pro index 8f4d21e..267f83a 100644 --- a/test/auto/domain/domain.pro +++ b/test/auto/domain/domain.pro @@ -1,4 +1,4 @@ -!include( ../../test.pri ) { - error( "Couldn't find the test.pri file!" ) +!include( ../auto.pri ) { + error( "Couldn't find the auto.pri file!" ) } SOURCES += tst_domain.cpp diff --git a/test/auto/qchart/qchart.pro b/test/auto/qchart/qchart.pro index 87a52da..53f6737 100644 --- a/test/auto/qchart/qchart.pro +++ b/test/auto/qchart/qchart.pro @@ -1,4 +1,4 @@ -!include( ../../test.pri ) { - error( "Couldn't find the test.pri file!" ) +!include( ../auto.pri ) { + error( "Couldn't find the auto.pri file!" ) } -SOURCES += tst_qchart.cpp \ No newline at end of file +SOURCES += tst_qchart.cpp diff --git a/test/auto/qchartview/qchartview.pro b/test/auto/qchartview/qchartview.pro index 8b27d7e..1cc04db 100644 --- a/test/auto/qchartview/qchartview.pro +++ b/test/auto/qchartview/qchartview.pro @@ -1,4 +1,4 @@ -!include( ../../test.pri ) { - error( "Couldn't find the test.pri file!" ) +!include( ../auto.pri ) { + error( "Couldn't find the auto.pri file!" ) } -SOURCES += tst_qchartview.cpp \ No newline at end of file +SOURCES += tst_qchartview.cpp diff --git a/test/test.pri b/test/test.pri index 7b6f594..3775b22 100644 --- a/test/test.pri +++ b/test/test.pri @@ -1,19 +1,14 @@ !include( ../common.pri ) { - error( "Couldn't find the common.pri file!" ) + error( "Couldn't find the common.pri file!" ) } - !include( ../integrated.pri ) { - error( "Couldn't find the integrated.pri file !") + error( "Couldn't find the integrated.pri file !") } TEMPLATE = app -CONFIG += qtestlib DESTDIR = $$CHART_BUILD_BIN_DIR/test OBJECTS_DIR = $$CHART_BUILD_DIR/test/$$TARGET MOC_DIR = $$CHART_BUILD_DIR/test/$$TARGET UI_DIR = $$CHART_BUILD_DIR/test/$$TARGET RCC_DIR = $$CHART_BUILD_DIR/test/$$TARGET - -!contains(TARGET, ^tst_.*):TARGET = $$join(TARGET,,"tst_") -