##// 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,5 +1,9
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
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
@@ -2,11 +2,13
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
Show file before | Show file after | Hide comments
@@ -1,3 +1,12
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
@@ -6,7 +15,6 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
@@ -22,12 +30,4 HEADERS += \
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