##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » USERS » JEANDET » qtcharts
RSS

Clone from http://code.qt.io/qt/qtcharts.git

Adds shadow build support
Michal Klocek -
r708:69e7126c2380
parent child
Show More
Show file before | Show file after | Hide comments
@@ -0,0 +1,12
1 INCLUDEPATH += $$PWD
2 DEPENDPATH += $$PWD
3
4 THEMES += \
5 $$PWD/chartthemedefault_p.h \
6 $$PWD/chartthemelight_p.h \
7 $$PWD/chartthemebluecerulean_p.h \
8 $$PWD/chartthemedark_p.h \
9 $$PWD/chartthemebrownsand_p.h \
10 $$PWD/chartthemebluencs_p.h \
11 $$PWD/chartthemeicy_p.h \
12 $$PWD/chartthemescientific_p.h No newline at end of file
Show file before | Show file after | Hide comments
@@ -28,5 +28,7 win32:{
28 28 }else{
29 29 doc.commands = qdoc3 $$CHART_BUILD_DOC_DIR/qcharts.qdocconf
30 30 }
31
31 32 doc.depends = FORCE
32 QMAKE_EXTRA_TARGETS += doc
33 QMAKE_EXTRA_TARGETS += docs
34
Show file before | Show file after | Hide comments
@@ -1,12 +1,27
1 1 CONFIG+=integrated_build #remove if you want to build against installed libs
2 2
3 CHART_BUILD_PUBLIC_HEADER_DIR = $$PWD/include
3 SHADOW = $$find(PWD, $${OUT_PWD})
4
5 unix:isEmpty(SHADOW){
6 search = "$$PWD:::"
7 temp = $$split(search,"/")
8 temp = $$last(temp)
9 path = $$replace(search,$$temp,'')
10 temp = $$split(OUT_PWD,$$path)
11 temp = $$split(temp,'/')
12 temp = $$first(temp)
13 path = "$${path}$${temp}"
14 SHADOW=$$path
15 }
16
17 CHART_BUILD_PUBLIC_HEADER_DIR = $$SHADOW/include
4 18 CHART_BUILD_PRIVATE_HEADER_DIR = $$CHART_BUILD_PUBLIC_HEADER_DIR/private
5 CHART_BUILD_LIB_DIR = $$PWD/lib
6 CHART_BUILD_DIR = $$PWD/build
7 CHART_BUILD_BIN_DIR = $$PWD/bin
19 CHART_BUILD_LIB_DIR = $$SHADOW/lib
20 CHART_BUILD_DIR = $$SHADOW/build
21 CHART_BUILD_BIN_DIR = $$SHADOW/bin
8 22 CHART_BUILD_PLUGIN_DIR = $$CHART_BUILD_LIB_DIR/QtCommercial/Chart
9 CHART_BUILD_DOC_DIR = $$PWD/doc
23 CHART_BUILD_DOC_DIR = $$SHADOW/doc
24
10 25
11 26 # hack to fix windows builds
12 27 win32:{
Show file before | Show file after | Hide comments
@@ -10,5 +10,5 HEADERS += widget.h
10 10
11 11 !mac {
12 12 # TODO: QMAKE_POST_LINK does not work on mac; how to copy the data file?
13 QMAKE_POST_LINK += $$QMAKE_COPY gdpData $$CHART_BUILD_BIN_DIR
13 QMAKE_POST_LINK += $$QMAKE_COPY $$PWD/gdpData $$CHART_BUILD_BIN_DIR
14 14 }
Show file before | Show file after | Hide comments
@@ -8,32 +8,32 win32-msvc*: LIBS += User32.lib
8 8 CONFIG += debug_and_release
9 9 CONFIG(debug, debug|release):TARGET = QtCommercialChartd
10 10 SOURCES += \
11 chartdataset.cpp \
12 chartpresenter.cpp \
13 charttheme.cpp \
14 domain.cpp \
15 qchart.cpp \
16 qchartview.cpp \
17 qseries.cpp \
18 qlegend.cpp \
19 legendmarker.cpp \
20 chartbackground.cpp \
21 chart.cpp
11 $$PWD/chartdataset.cpp \
12 $$PWD/chartpresenter.cpp \
13 $$PWD/charttheme.cpp \
14 $$PWD/domain.cpp \
15 $$PWD/qchart.cpp \
16 $$PWD/qchartview.cpp \
17 $$PWD/qseries.cpp \
18 $$PWD/qlegend.cpp \
19 $$PWD/legendmarker.cpp \
20 $$PWD/chartbackground.cpp \
21 $$PWD/chart.cpp
22 22 PRIVATE_HEADERS += \
23 chartdataset_p.h \
24 chartitem_p.h \
25 chartpresenter_p.h \
26 charttheme_p.h \
27 domain_p.h \
28 legendmarker_p.h \
29 chartbackground_p.h \
30 chart_p.h
23 $$PWD/chartdataset_p.h \
24 $$PWD/chartitem_p.h \
25 $$PWD/chartpresenter_p.h \
26 $$PWD/charttheme_p.h \
27 $$PWD/domain_p.h \
28 $$PWD/legendmarker_p.h \
29 $$PWD/chartbackground_p.h \
30 $$PWD/chart_p.h
31 31 PUBLIC_HEADERS += \
32 qchart.h \
33 qchartglobal.h \
34 qseries.h \
35 qchartview.h \
36 qlegend.h
32 $$PWD/qchart.h \
33 $$PWD/qchartglobal.h \
34 $$PWD/qseries.h \
35 $$PWD/qchartview.h \
36 $$PWD/qlegend.h
37 37
38 38 include(animations/animations.pri)
39 39 include(axis/axis.pri)
@@ -44,15 +44,8 include(barchart/barchart.pri)
44 44 include(piechart/piechart.pri)
45 45 include(scatterseries/scatter.pri)
46 46 include(splinechart/splinechart.pri)
47 include(themes/themes.pri)
47 48
48 THEMES += themes/chartthemedefault_p.h \
49 themes/chartthemelight_p.h \
50 themes/chartthemebluecerulean_p.h \
51 themes/chartthemedark_p.h \
52 themes/chartthemebrownsand_p.h \
53 themes/chartthemebluencs_p.h \
54 themes/chartthemeicy_p.h \
55 themes/chartthemescientific_p.h
56 49
57 50 HEADERS += $$PUBLIC_HEADERS
58 51 HEADERS += $$PRIVATE_HEADERS
Show file before | Show file after | Hide comments
@@ -1,4 +1,4
1 !include( ../test.pri ) {
1 !include( ../../test.pri ) {
2 2 error( "Couldn't find the test.pri file!" )
3 3 }
4 4 SOURCES += tst_chartdataset.cpp
Show file before | Show file after | Hide comments
@@ -1,4 +1,4
1 !include( ../test.pri ) {
1 !include( ../../test.pri ) {
2 2 error( "Couldn't find the test.pri file!" )
3 3 }
4 4 SOURCES += tst_domain.cpp
Show file before | Show file after | Hide comments
@@ -1,22 +1,15
1 !include( ../../common.pri ) {
2 error( "Couldn't find the common.pri file!" )
3 }
4 !include( ../../integrated.pri ) {
5 error( "Couldn't find the integrated.pri file !")
1 !include( ../test.pri ) {
2 error( "Couldn't find the test.pri file!" )
6 3 }
7 4
8 5 TARGET = chartwidgettest
9 6 TEMPLATE = app
10 DESTDIR = $$CHART_BUILD_BIN_DIR
11 7
12 8 QT += core gui
13 9 contains(QT_MAJOR_VERSION, 5) {
14 10 QT += widgets
15 11 }
16 12
17 OBJECTS_DIR = tmp
18 MOC_DIR = tmp
19
20 13 SOURCES += main.cpp \
21 14 mainwidget.cpp \
22 15 dataseriedialog.cpp
Show file before | Show file after | Hide comments
@@ -1,14 +1,7
1 !include( ../../common.pri ) {
1 !include( ../test.pri ) {
2 2 error( "Couldn't find the common.pri file!" )
3 3 }
4 4
5 DESTDIR = $$CHART_BUILD_BIN_DIR
6
7 OBJECTS_DIR = $$CHART_BUILD_DIR/bin/$$TARGET
8 MOC_DIR = $$CHART_BUILD_DIR/bin/$$TARGET
9 UI_DIR = $$CHART_BUILD_DIR/bin/$$TARGET
10 RCC_DIR = $$CHART_BUILD_DIR/bin/$$TARGET
11
12 5 integrated_build:{
13 6 message(Please export QML_IMPORT_PATH=$$CHART_BUILD_LIB_DIR)
14 7 }
Show file before | Show file after | Hide comments
@@ -1,8 +1,8
1 !include( ../../common.pri ) {
1 !include( ../common.pri ) {
2 2 error( "Couldn't find the common.pri file!" )
3 3 }
4 4
5 !include( ../../integrated.pri ) {
5 !include( ../integrated.pri ) {
6 6 error( "Couldn't find the integrated.pri file !")
7 7 }
8 8
General Comments 0
You need to be logged in to leave comments. Login now