##// 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 5 TEMPLATE = subdirs
2 SUBDIRS += src example #qmlplugin
6 SUBDIRS += src example test
3 7 CONFIG += ordered
4 8 QMAKE_CXXFLAGS += -g -Wall
5 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 3 CHART_BUILD_HEADER_DIR = $$PWD/include
2 4 CHART_BUILD_LIB_DIR = $$PWD/lib
3 5 CHART_BUILD_DIR = $$PWD/build
4 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 9 TARGET = lineChart
4 10 TEMPLATE = app
5 11 QT += core gui
6 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 2 message('Internal build within charts core source tree')
3 3 INCLUDEPATH += $$CHART_BUILD_HEADER_DIR
4 4 LIBS += -L $$CHART_BUILD_LIB_DIR -Wl,-rpath,$$CHART_BUILD_LIB_DIR
5 5 DESTDIR = $$CHART_BUILD_BIN
6 6 CONFIG(debug, debug|release) {
7 7 LIBS += -lQtCommercialChartd
8 } else {
8 } else {
9 9 LIBS += -lQtCommercialChart
10 }
11
10 }
11 }else{
12 CONFIG+=qtcommercialchart
12 13 }
Show file before | Show file after | Hide comments
@@ -2,11 +2,13
2 2 error( Couldn't find the common.pri file! )
3 3 }
4 4
5
5 6 TARGET = QtCommercialChart
6 7 DESTDIR = $$CHART_BUILD_LIB_DIR
7 8 TEMPLATE = lib
8 9 QT += core \
9 10 gui
11 CONFIG -= internal_build
10 12 CONFIG += debug_and_release
11 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 10 TARGET = chartwidgettest
2 11 TEMPLATE = app
3 12
@@ -6,7 +15,6 contains(QT_MAJOR_VERSION, 5) {
6 15 QT += widgets
7 16 }
8 17
9 CONFIG += qtcommercialchart
10 18
11 19 OBJECTS_DIR = tmp
12 20 MOC_DIR = tmp
@@ -22,12 +30,4 HEADERS += \
22 30 # qscatterseries.h \
23 31 # qseriespointgraphicsitem.h \
24 32 dataseriedialog.h
25
26
27
28
29
30
31
32
33
33
General Comments 0
You need to be logged in to leave comments. Login now