From 43766a7259197d0d536e34104e74a660a3cbc6cc 2012-02-21 09:44:51 From: Michal Klocek Date: 2012-02-21 09:44:51 Subject: [PATCH] Examples build setup cleanup --- diff --git a/example/axischart/axischart.pro b/example/axischart/axischart.pro index 1bef56e..d88e462 100644 --- a/example/axischart/axischart.pro +++ b/example/axischart/axischart.pro @@ -1,7 +1,7 @@ !include( ../example.pri ) { error( "Couldn't find the example.pri file!" ) } -TARGET = axisChart +TARGET = axischart SOURCES = main.cpp diff --git a/example/barchart/barchart.pro b/example/barchart/barchart.pro index 3cc7fa6..009c8c7 100644 --- a/example/barchart/barchart.pro +++ b/example/barchart/barchart.pro @@ -1,17 +1,10 @@ -!include( ../../common.pri ) { - error( "Couldn't find the common.pri file!" ) -} - -!include( ../../integrated.pri ) { - error( "Couldn't find the integrated.pri file !") +!include( ../example.pri ) { + error( "Couldn't find the example.pri file!" ) } TARGET = barchart -TEMPLATE = app -QT += core gui SOURCES += main.cpp \ chartwidget.cpp - HEADERS += \ chartwidget.h diff --git a/example/colorlinechart/colorlinechart.pro b/example/colorlinechart/colorlinechart.pro index 784936a..e7c20ec 100644 --- a/example/colorlinechart/colorlinechart.pro +++ b/example/colorlinechart/colorlinechart.pro @@ -1,14 +1,8 @@ -!include( ../../common.pri ) { - error( "Couldn't find the common.pri file!" ) +!include( ../example.pri ) { + error( "Couldn't find the example.pri file!" ) } -!include( ../../integrated.pri ) { - error( "Couldn't find the integrated.pri file !") -} - -TARGET = colorlineChart -TEMPLATE = app -QT += core gui +TARGET = colorlinechart SOURCES += main.cpp diff --git a/example/dynamiclinechart/dynamiclinechart.pro b/example/dynamiclinechart/dynamiclinechart.pro index 5e0d4d5..90f5aae 100644 --- a/example/dynamiclinechart/dynamiclinechart.pro +++ b/example/dynamiclinechart/dynamiclinechart.pro @@ -1,14 +1,8 @@ -!include( ../../common.pri ) { - error( "Couldn't find the common.pri file!" ) +!include( ../example.pri ) { + error( "Couldn't find the example.pri file!" ) } - -!include( ../../integrated.pri ) { - error( "Couldn't find the integrated.pri file !") -} - -TARGET = dynamicLineChart -TEMPLATE = app -QT += core gui opengl +QT+=opengl +TARGET = dynamiclinechart SOURCES += main.cpp HEADERS += wavegenerator.h diff --git a/example/example.pri b/example/example.pri index 4ed8249..53fbe14 100644 --- a/example/example.pri +++ b/example/example.pri @@ -6,5 +6,11 @@ error( "Couldn't find the integrated.pri file !") } +DESTDIR = $$CHART_BUILD_BIN_DIR +OBJECTS_DIR = $$CHART_BUILD_DIR/bin/$$TARGET +MOC_DIR = $$CHART_BUILD_DIR/bin/$$TARGET +UI_DIR = $$CHART_BUILD_DIR/bin/$$TARGET +RCC_DIR = $$CHART_BUILD_DIR/bin/$$TARGET + TEMPLATE = app QT += core gui \ No newline at end of file diff --git a/example/gdpbarchart/gdpbarchart.pro b/example/gdpbarchart/gdpbarchart.pro index 10aa172..b4d95dc 100644 --- a/example/gdpbarchart/gdpbarchart.pro +++ b/example/gdpbarchart/gdpbarchart.pro @@ -1,25 +1,11 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2012-02-14T15:27:32 -# -#------------------------------------------------- - -!include( ../../common.pri ) { - error( "Couldn't find the common.pri file!" ) -} -!include( ../../integrated.pri ) { - error( "Couldn't find the integrated.pri file !") +!include( ../example.pri ) { + error( "Couldn't find the example.pri file!" ) } -QT += core gui sql - +QT+= sql TARGET = gdpbarchart -TEMPLATE = app - - SOURCES += main.cpp\ widget.cpp - HEADERS += widget.h COPY_DATABASE_COMMAND = $$QMAKE_COPY gdpData $$CHART_BUILD_BIN_DIR/gdpData diff --git a/example/linechart/linechart.pro b/example/linechart/linechart.pro index 13b6748..489e6ad 100644 --- a/example/linechart/linechart.pro +++ b/example/linechart/linechart.pro @@ -1,14 +1,7 @@ -!include( ../../common.pri ) { - error( "Couldn't find the common.pri file!" ) +!include( ../example.pri ) { + error( "Couldn't find the example.pri file!" ) } - -!include( ../../integrated.pri ) { - error( "Couldn't find the integrated.pri file !") -} - -TARGET = lineChart -TEMPLATE = app -QT += core gui +TARGET = linechart SOURCES += main.cpp diff --git a/example/multichart/multichart.pro b/example/multichart/multichart.pro index ae573ac..5a351e9 100644 --- a/example/multichart/multichart.pro +++ b/example/multichart/multichart.pro @@ -1,18 +1,9 @@ -!include( ../../common.pri ) { - error( "Couldn't find the common.pri file!" ) +!include( ../example.pri ) { + error( "Couldn't find the example.pri file!" ) } -!include( ../../integrated.pri ) { - error( "Couldn't find the integrated.pri file !") -} - -QT += core gui - TARGET = multichart -TEMPLATE = app - SOURCES += main.cpp \ multichartwidget.cpp - HEADERS += \ multichartwidget.h diff --git a/example/percentbarchart/percentbarchart.pro b/example/percentbarchart/percentbarchart.pro index b2c8e0e..4f19441 100644 --- a/example/percentbarchart/percentbarchart.pro +++ b/example/percentbarchart/percentbarchart.pro @@ -1,17 +1,10 @@ -!include( ../../common.pri ) { - error( "Couldn't find the common.pri file!" ) -} - -!include( ../../integrated.pri ) { - error( "Couldn't find the integrated.pri file !") +!include( ../example.pri ) { + error( "Couldn't find the example.pri file!" ) } TARGET = percentbarchart -TEMPLATE = app -QT += core gui SOURCES += main.cpp \ chartwidget.cpp - HEADERS += \ chartwidget.h diff --git a/example/piechart/piechart.pro b/example/piechart/piechart.pro index 29de32e..85c2b35 100644 --- a/example/piechart/piechart.pro +++ b/example/piechart/piechart.pro @@ -1,19 +1,8 @@ -!include( ../../common.pri ) { - error( "Couldn't find the common.pri file!" ) +!include( ../example.pri ) { + error( "Couldn't find the example.pri file!" ) } -!include( ../../integrated.pri ) { - error( "Couldn't find the integrated.pri file !") -} - -QT += core gui - TARGET = piechart -TEMPLATE = app - SOURCES += main.cpp customslice.cpp HEADERS += customslice.h -OBJECTS_DIR = tmp -MOC_DIR = tmp - diff --git a/example/scatter/scatter.pro b/example/scatter/scatter.pro index 5e28333..b677f26 100644 --- a/example/scatter/scatter.pro +++ b/example/scatter/scatter.pro @@ -1,17 +1,8 @@ -!include( ../../common.pri ) { - error( "Couldn't find the common.pri file!" ) +!include( ../example.pri ) { + error( "Couldn't find the example.pri file!" ) } -!include( ../../integrated.pri ) { - error( "Couldn't find the integrated.pri file !") -} - -QT += core gui - TARGET = scatter -TEMPLATE = app - SOURCES += main.cpp -HEADERS += diff --git a/example/stackedbarchart/stackedbarchart.pro b/example/stackedbarchart/stackedbarchart.pro index e2928cb..33296fa 100644 --- a/example/stackedbarchart/stackedbarchart.pro +++ b/example/stackedbarchart/stackedbarchart.pro @@ -1,17 +1,9 @@ -!include( ../../common.pri ) { - error( "Couldn't find the common.pri file!" ) +!include( ../example.pri ) { + error( "Couldn't find the example.pri file!" ) } - -!include( ../../integrated.pri ) { - error( "Couldn't find the integrated.pri file !") -} - TARGET = stackedbarchart -TEMPLATE = app -QT += core gui SOURCES += main.cpp \ chartwidget.cpp - HEADERS += \ chartwidget.h diff --git a/example/zoomlinechart/zoomlinechart.pro b/example/zoomlinechart/zoomlinechart.pro index e7062fe..6fe0790 100644 --- a/example/zoomlinechart/zoomlinechart.pro +++ b/example/zoomlinechart/zoomlinechart.pro @@ -1,14 +1,7 @@ -!include( ../../common.pri ) { - error( "Couldn't find the common.pri file!" ) +!include( ../example.pri ) { + error( "Couldn't find the example.pri file!" ) } - -!include( ../../integrated.pri ) { - error( "Couldn't find the integrated.pri file !") -} - -TARGET = zoomLineChart -TEMPLATE = app -QT += core gui +TARGET = zoomlinechart HEADERS += chartwidget.h SOURCES += main.cpp chartwidget.cpp diff --git a/integrated.pri b/integrated.pri index f6d4e24..5440857 100644 --- a/integrated.pri +++ b/integrated.pri @@ -14,8 +14,6 @@ integrated_build:{ } } - DESTDIR = $$CHART_BUILD_BIN_DIR - CONFIG(debug, debug|release) { LIBS += -lQtCommercialChartd #this is ugly hack to work around missing rpath, it simply copies lib diff --git a/test/auto/test.pri b/test/auto/test.pri index 4ad95c6..ba09e16 100644 --- a/test/auto/test.pri +++ b/test/auto/test.pri @@ -8,4 +8,12 @@ TEMPLATE = app CONFIG += qtestlib -!contains(TARGET, ^tst_.*):TARGET = $$join(TARGET,,"tst_") \ No newline at end of file + +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_") +