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

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

Add test to common build
Michal Klocek -
r34:6c759135fcbb
parent child
Show More
Show file before | Show file after | Hide comments
@@ -0,0 +1,2
1 TEMPLATE = subdirs
2 SUBDIRS += chartwidgettest
Show file before | Show file after | Hide comments
@@ -1,10 +1,14
1 !include(common.pri) {
2 error('missing common.pri')
3 }
4
1 TEMPLATE = subdirs
5 TEMPLATE = subdirs
2 SUBDIRS += src example #qmlplugin
6 SUBDIRS += src example test
3 CONFIG += ordered
7 CONFIG += ordered
4 QMAKE_CXXFLAGS += -g -Wall
8 QMAKE_CXXFLAGS += -g -Wall
5 QMAKE_DISTCLEAN += -r build bin
9 QMAKE_DISTCLEAN += -r build bin
6
10
7 # install feature file
11 # install feature file
8 feature.path = $$[QT_INSTALL_DATA]/mkspecs/features
12 feature.path = $$[QT_INSTALL_DATA]/mkspecs/features
9 feature.files = $$PWD/features/qtcommercialchart.prf
13 feature.files = $$PWD/features/qtcommercialchart.prf
10 INSTALLS += feature
14 INSTALLS += feature
Show file before | Show file after | Hide comments
@@ -1,6 +1,8
1 CONFIG+=internal_build #remove if you want to build against installed libs
2
1 CHART_BUILD_HEADER_DIR = $$PWD/include
3 CHART_BUILD_HEADER_DIR = $$PWD/include
2 CHART_BUILD_LIB_DIR = $$PWD/lib
4 CHART_BUILD_LIB_DIR = $$PWD/lib
3 CHART_BUILD_DIR = $$PWD/build
5 CHART_BUILD_DIR = $$PWD/build
4 CHART_BUILD_BIN = $$PWD/bin
6 CHART_BUILD_BIN = $$PWD/bin
5 CONFIG+=build_examples
7
6
8
Show file before | Show file after | Hide comments
@@ -1,13 +1,15
1 CONFIG += internal_build
1 !include( ../../common.pri ) {
2 error( Couldn't find the common.pri file! )
3 }
4
5 !include( ../../internal.pri ) {
6 error( Couldn't find the internal.pri file !)
7 }
2
8
3 TARGET = lineChart
9 TARGET = lineChart
4 TEMPLATE = app
10 TEMPLATE = app
5 QT += core gui
11 QT += core gui
6 SOURCES += main.cpp
12 SOURCES += main.cpp
7
13
8 !include( ../../common.pri ) {
9 message('missing common pri')
10 CONFIG += qtcommercialchart
11 }
12
14
13
15
Show file before | Show file after | Hide comments
@@ -1,12 +1,13
1 build_examples:{
1 internal_build:{
2 message('Internal build within charts core source tree')
2 message('Internal build within charts core source tree')
3 INCLUDEPATH += $$CHART_BUILD_HEADER_DIR
3 INCLUDEPATH += $$CHART_BUILD_HEADER_DIR
4 LIBS += -L $$CHART_BUILD_LIB_DIR -Wl,-rpath,$$CHART_BUILD_LIB_DIR
4 LIBS += -L $$CHART_BUILD_LIB_DIR -Wl,-rpath,$$CHART_BUILD_LIB_DIR
5 DESTDIR = $$CHART_BUILD_BIN
5 DESTDIR = $$CHART_BUILD_BIN
6 CONFIG(debug, debug|release) {
6 CONFIG(debug, debug|release) {
7 LIBS += -lQtCommercialChartd
7 LIBS += -lQtCommercialChartd
8 } else {
8 } else {
9 LIBS += -lQtCommercialChart
9 LIBS += -lQtCommercialChart
10 }
10 }
11
11 }else{
12 CONFIG+=qtcommercialchart
12 }
13 }
Show file before | Show file after | Hide comments
@@ -1,70 +1,72
1 !include( ../common.pri ) {
1 !include( ../common.pri ) {
2 error( Couldn't find the common.pri file! )
2 error( Couldn't find the common.pri file! )
3 }
3 }
4
4
5
5 TARGET = QtCommercialChart
6 TARGET = QtCommercialChart
6 DESTDIR = $$CHART_BUILD_LIB_DIR
7 DESTDIR = $$CHART_BUILD_LIB_DIR
7 TEMPLATE = lib
8 TEMPLATE = lib
8 QT += core \
9 QT += core \
9 gui
10 gui
11 CONFIG -= internal_build
10 CONFIG += debug_and_release
12 CONFIG += debug_and_release
11 CONFIG(debug, debug|release):TARGET = QtCommercialChartd
13 CONFIG(debug, debug|release):TARGET = QtCommercialChartd
12
14
13 SOURCES += \
15 SOURCES += \
14 xylinechart/qxychartseries.cpp \
16 xylinechart/qxychartseries.cpp \
15 xylinechart/xylinechartitem.cpp \
17 xylinechart/xylinechartitem.cpp \
16 xylinechart/xygrid.cpp \
18 xylinechart/xygrid.cpp \
17 xylinechart/xyplotdomain.cpp \
19 xylinechart/xyplotdomain.cpp \
18 qchart.cpp \
20 qchart.cpp \
19 axis.cpp \
21 axis.cpp \
20 qchartwidget.cpp
22 qchartwidget.cpp
21
23
22 PRIVATE_HEADERS += \
24 PRIVATE_HEADERS += \
23 xylinechart/xylinechartitem_p.h \
25 xylinechart/xylinechartitem_p.h \
24 xylinechart/xyplotdomain_p.h \
26 xylinechart/xyplotdomain_p.h \
25 xylinechart/xygrid_p.h \
27 xylinechart/xygrid_p.h \
26 axis_p.h
28 axis_p.h
27
29
28 PUBLIC_HEADERS += \
30 PUBLIC_HEADERS += \
29 qchartseries.h \
31 qchartseries.h \
30 qchart.h \
32 qchart.h \
31 qchartwidget.h \
33 qchartwidget.h \
32 qchartglobal.h \
34 qchartglobal.h \
33 xylinechart/qxychartseries.h
35 xylinechart/qxychartseries.h
34
36
35 HEADERS += $$PUBLIC_HEADERS
37 HEADERS += $$PUBLIC_HEADERS
36 HEADERS += $$PRIVATE_HEADERS
38 HEADERS += $$PRIVATE_HEADERS
37
39
38 INCLUDEPATH += xylinechart \
40 INCLUDEPATH += xylinechart \
39 .
41 .
40
42
41 OBJECTS_DIR = $$CHART_BUILD_DIR/lib
43 OBJECTS_DIR = $$CHART_BUILD_DIR/lib
42 MOC_DIR = $$CHART_BUILD_DIR/lib
44 MOC_DIR = $$CHART_BUILD_DIR/lib
43 UI_DIR = $$CHART_BUILD_DIR/lib
45 UI_DIR = $$CHART_BUILD_DIR/lib
44 RCC_DIR = $$CHART_BUILD_DIR/lib
46 RCC_DIR = $$CHART_BUILD_DIR/lib
45
47
46
48
47 DEFINES += QTCOMMERCIALCHART_LIBRARY
49 DEFINES += QTCOMMERCIALCHART_LIBRARY
48
50
49 public_headers.path = $$[QT_INSTALL_HEADERS]/QtCommercialChart
51 public_headers.path = $$[QT_INSTALL_HEADERS]/QtCommercialChart
50 public_headers.files = $$PUBLIC_HEADERS
52 public_headers.files = $$PUBLIC_HEADERS
51 target.path = $$[QT_INSTALL_LIBS]
53 target.path = $$[QT_INSTALL_LIBS]
52 INSTALLS += target \
54 INSTALLS += target \
53 public_headers
55 public_headers
54
56
55
57
56 install_build_headers.name = bild_headers
58 install_build_headers.name = bild_headers
57 install_build_headers.output = $$CHART_BUILD_HEADER_DIR/${QMAKE_FILE_BASE}.h
59 install_build_headers.output = $$CHART_BUILD_HEADER_DIR/${QMAKE_FILE_BASE}.h
58 install_build_headers.input = PUBLIC_HEADERS
60 install_build_headers.input = PUBLIC_HEADERS
59 install_build_headers.commands = $$QMAKE_COPY ${QMAKE_FILE_NAME} $$CHART_BUILD_HEADER_DIR
61 install_build_headers.commands = $$QMAKE_COPY ${QMAKE_FILE_NAME} $$CHART_BUILD_HEADER_DIR
60 install_build_headers.CONFIG += target_predeps no_link
62 install_build_headers.CONFIG += target_predeps no_link
61 QMAKE_EXTRA_COMPILERS += install_build_headers
63 QMAKE_EXTRA_COMPILERS += install_build_headers
62
64
63 chartversion.target = qchartversion_p.h
65 chartversion.target = qchartversion_p.h
64 chartversion.commands = @echo "build_time" > $$chartversion.target;
66 chartversion.commands = @echo "build_time" > $$chartversion.target;
65 chartversion.depends = $$HEADERS $$SOURCES
67 chartversion.depends = $$HEADERS $$SOURCES
66 PRE_TARGETDEPS += qchartversion_p.h
68 PRE_TARGETDEPS += qchartversion_p.h
67 QMAKE_CLEAN+= qchartversion_p.h
69 QMAKE_CLEAN+= qchartversion_p.h
68 QMAKE_EXTRA_TARGETS += chartversion
70 QMAKE_EXTRA_TARGETS += chartversion
69
71
70 QMAKE_DISTCLEAN += -r $$CHART_BUILD_HEADER_DIR $$CHART_BUILD_LIB_DIR No newline at end of file
72 QMAKE_DISTCLEAN += -r $$CHART_BUILD_HEADER_DIR $$CHART_BUILD_LIB_DIR
Show file before | Show file after | Hide comments
@@ -1,33 +1,33
1 !include( ../../common.pri ) {
2 error( Couldn't find the common.pri file! )
3 }
4
5 !include( ../../internal.pri ) {
6 error( Couldn't find the internal.pri file! )
7 }
8
9
1 TARGET = chartwidgettest
10 TARGET = chartwidgettest
2 TEMPLATE = app
11 TEMPLATE = app
3
12
4 QT += core gui
13 QT += core gui
5 contains(QT_MAJOR_VERSION, 5) {
14 contains(QT_MAJOR_VERSION, 5) {
6 QT += widgets
15 QT += widgets
7 }
16 }
8
17
9 CONFIG += qtcommercialchart
10
18
11 OBJECTS_DIR = tmp
19 OBJECTS_DIR = tmp
12 MOC_DIR = tmp
20 MOC_DIR = tmp
13
21
14 SOURCES += main.cpp \
22 SOURCES += main.cpp \
15 mainwidget.cpp \
23 mainwidget.cpp \
16 # qscatterseries.cpp \
24 # qscatterseries.cpp \
17 # qseriespointgraphicsitem.cpp \
25 # qseriespointgraphicsitem.cpp \
18 dataseriedialog.cpp
26 dataseriedialog.cpp
19
27
20 HEADERS += \
28 HEADERS += \
21 mainwidget.h \
29 mainwidget.h \
22 # qscatterseries.h \
30 # qscatterseries.h \
23 # qseriespointgraphicsitem.h \
31 # qseriespointgraphicsitem.h \
24 dataseriedialog.h
32 dataseriedialog.h
25
33
26
27
28
29
30
31
32
33
General Comments 0
You need to be logged in to leave comments. Login now