From 69e7126c2380228d615acab949d4c0e1a9ad57db 2012-03-23 09:29:05 From: Michal Klocek Date: 2012-03-23 09:29:05 Subject: [PATCH] Adds shadow build support --- diff --git a/charts.pro b/charts.pro index eca1f45..8efe692 100644 --- a/charts.pro +++ b/charts.pro @@ -28,5 +28,7 @@ win32:{ }else{ doc.commands = qdoc3 $$CHART_BUILD_DOC_DIR/qcharts.qdocconf } + doc.depends = FORCE -QMAKE_EXTRA_TARGETS += doc +QMAKE_EXTRA_TARGETS += docs + diff --git a/common.pri b/common.pri index ec6f0dc..e7619f9 100644 --- a/common.pri +++ b/common.pri @@ -1,12 +1,27 @@ CONFIG+=integrated_build #remove if you want to build against installed libs -CHART_BUILD_PUBLIC_HEADER_DIR = $$PWD/include +SHADOW = $$find(PWD, $${OUT_PWD}) + +unix:isEmpty(SHADOW){ + search = "$$PWD:::" + temp = $$split(search,"/") + temp = $$last(temp) + path = $$replace(search,$$temp,'') + temp = $$split(OUT_PWD,$$path) + temp = $$split(temp,'/') + temp = $$first(temp) + path = "$${path}$${temp}" + SHADOW=$$path +} + +CHART_BUILD_PUBLIC_HEADER_DIR = $$SHADOW/include CHART_BUILD_PRIVATE_HEADER_DIR = $$CHART_BUILD_PUBLIC_HEADER_DIR/private -CHART_BUILD_LIB_DIR = $$PWD/lib -CHART_BUILD_DIR = $$PWD/build -CHART_BUILD_BIN_DIR = $$PWD/bin +CHART_BUILD_LIB_DIR = $$SHADOW/lib +CHART_BUILD_DIR = $$SHADOW/build +CHART_BUILD_BIN_DIR = $$SHADOW/bin CHART_BUILD_PLUGIN_DIR = $$CHART_BUILD_LIB_DIR/QtCommercial/Chart -CHART_BUILD_DOC_DIR = $$PWD/doc +CHART_BUILD_DOC_DIR = $$SHADOW/doc + # hack to fix windows builds win32:{ diff --git a/examples/gdpbarchart/gdpbarchart.pro b/examples/gdpbarchart/gdpbarchart.pro index 0150c70..f8997a0 100644 --- a/examples/gdpbarchart/gdpbarchart.pro +++ b/examples/gdpbarchart/gdpbarchart.pro @@ -10,5 +10,5 @@ HEADERS += widget.h !mac { # TODO: QMAKE_POST_LINK does not work on mac; how to copy the data file? - QMAKE_POST_LINK += $$QMAKE_COPY gdpData $$CHART_BUILD_BIN_DIR + QMAKE_POST_LINK += $$QMAKE_COPY $$PWD/gdpData $$CHART_BUILD_BIN_DIR } diff --git a/src/src.pro b/src/src.pro index bf6291e..3e09ead 100644 --- a/src/src.pro +++ b/src/src.pro @@ -8,32 +8,32 @@ win32-msvc*: LIBS += User32.lib CONFIG += debug_and_release CONFIG(debug, debug|release):TARGET = QtCommercialChartd SOURCES += \ - chartdataset.cpp \ - chartpresenter.cpp \ - charttheme.cpp \ - domain.cpp \ - qchart.cpp \ - qchartview.cpp \ - qseries.cpp \ - qlegend.cpp \ - legendmarker.cpp \ - chartbackground.cpp \ - chart.cpp + $$PWD/chartdataset.cpp \ + $$PWD/chartpresenter.cpp \ + $$PWD/charttheme.cpp \ + $$PWD/domain.cpp \ + $$PWD/qchart.cpp \ + $$PWD/qchartview.cpp \ + $$PWD/qseries.cpp \ + $$PWD/qlegend.cpp \ + $$PWD/legendmarker.cpp \ + $$PWD/chartbackground.cpp \ + $$PWD/chart.cpp PRIVATE_HEADERS += \ - chartdataset_p.h \ - chartitem_p.h \ - chartpresenter_p.h \ - charttheme_p.h \ - domain_p.h \ - legendmarker_p.h \ - chartbackground_p.h \ - chart_p.h + $$PWD/chartdataset_p.h \ + $$PWD/chartitem_p.h \ + $$PWD/chartpresenter_p.h \ + $$PWD/charttheme_p.h \ + $$PWD/domain_p.h \ + $$PWD/legendmarker_p.h \ + $$PWD/chartbackground_p.h \ + $$PWD/chart_p.h PUBLIC_HEADERS += \ - qchart.h \ - qchartglobal.h \ - qseries.h \ - qchartview.h \ - qlegend.h + $$PWD/qchart.h \ + $$PWD/qchartglobal.h \ + $$PWD/qseries.h \ + $$PWD/qchartview.h \ + $$PWD/qlegend.h include(animations/animations.pri) include(axis/axis.pri) @@ -44,15 +44,8 @@ include(barchart/barchart.pri) include(piechart/piechart.pri) include(scatterseries/scatter.pri) include(splinechart/splinechart.pri) +include(themes/themes.pri) -THEMES += themes/chartthemedefault_p.h \ - themes/chartthemelight_p.h \ - themes/chartthemebluecerulean_p.h \ - themes/chartthemedark_p.h \ - themes/chartthemebrownsand_p.h \ - themes/chartthemebluencs_p.h \ - themes/chartthemeicy_p.h \ - themes/chartthemescientific_p.h HEADERS += $$PUBLIC_HEADERS HEADERS += $$PRIVATE_HEADERS diff --git a/src/themes/themes.pri b/src/themes/themes.pri new file mode 100644 index 0000000..c2f7030 --- /dev/null +++ b/src/themes/themes.pri @@ -0,0 +1,12 @@ +INCLUDEPATH += $$PWD +DEPENDPATH += $$PWD + +THEMES += \ + $$PWD/chartthemedefault_p.h \ + $$PWD/chartthemelight_p.h \ + $$PWD/chartthemebluecerulean_p.h \ + $$PWD/chartthemedark_p.h \ + $$PWD/chartthemebrownsand_p.h \ + $$PWD/chartthemebluencs_p.h \ + $$PWD/chartthemeicy_p.h \ + $$PWD/chartthemescientific_p.h \ No newline at end of file diff --git a/test/auto/chartdataset/chartdataset.pro b/test/auto/chartdataset/chartdataset.pro index edfcb20..bf89a47 100644 --- a/test/auto/chartdataset/chartdataset.pro +++ b/test/auto/chartdataset/chartdataset.pro @@ -1,4 +1,4 @@ -!include( ../test.pri ) { +!include( ../../test.pri ) { error( "Couldn't find the test.pri file!" ) } SOURCES += tst_chartdataset.cpp diff --git a/test/auto/domain/domain.pro b/test/auto/domain/domain.pro index 5f90efb..8f4d21e 100644 --- a/test/auto/domain/domain.pro +++ b/test/auto/domain/domain.pro @@ -1,4 +1,4 @@ -!include( ../test.pri ) { +!include( ../../test.pri ) { error( "Couldn't find the test.pri file!" ) } SOURCES += tst_domain.cpp diff --git a/test/chartwidgettest/chartwidgettest.pro b/test/chartwidgettest/chartwidgettest.pro index 38e8aa1..121d295 100644 --- a/test/chartwidgettest/chartwidgettest.pro +++ b/test/chartwidgettest/chartwidgettest.pro @@ -1,22 +1,15 @@ -!include( ../../common.pri ) { - error( "Couldn't find the common.pri file!" ) -} -!include( ../../integrated.pri ) { - error( "Couldn't find the integrated.pri file !") +!include( ../test.pri ) { + error( "Couldn't find the test.pri file!" ) } TARGET = chartwidgettest TEMPLATE = app -DESTDIR = $$CHART_BUILD_BIN_DIR QT += core gui contains(QT_MAJOR_VERSION, 5) { QT += widgets } -OBJECTS_DIR = tmp -MOC_DIR = tmp - SOURCES += main.cpp \ mainwidget.cpp \ dataseriedialog.cpp diff --git a/test/qmlchart/qmlchart.pro b/test/qmlchart/qmlchart.pro index ed8d5f0..bbc9367 100644 --- a/test/qmlchart/qmlchart.pro +++ b/test/qmlchart/qmlchart.pro @@ -1,14 +1,7 @@ -!include( ../../common.pri ) { +!include( ../test.pri ) { error( "Couldn't find the common.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 - integrated_build:{ message(Please export QML_IMPORT_PATH=$$CHART_BUILD_LIB_DIR) } diff --git a/test/auto/test.pri b/test/test.pri similarity index 85% rename from test/auto/test.pri rename to test/test.pri index ba09e16..7b6f594 100644 --- a/test/auto/test.pri +++ b/test/test.pri @@ -1,8 +1,8 @@ -!include( ../../common.pri ) { +!include( ../common.pri ) { error( "Couldn't find the common.pri file!" ) } -!include( ../../integrated.pri ) { +!include( ../integrated.pri ) { error( "Couldn't find the integrated.pri file !") }