##// END OF EJS Templates
Merge branch 'master' of https://git.it.local/repos/QtCommercialDevel-13049/charts Conflicts: example/example.pro src/chartdataset.cpp src/chartpresenter.cpp src/charttheme_p.h

File last commit:

r252:43766a725919
r426:95162da3dc01 merge
Show More
linechart.pro
8 lines | 121 B | text/idl | PrologLexer
Michal Klocek
Examples build setup cleanup
r252 !include( ../example.pri ) {
error( "Couldn't find the example.pri file!" )
Michal Klocek
Add test to common build
r34 }
Michal Klocek
Examples build setup cleanup
r252 TARGET = linechart
Michal Klocek
Adds examples to common build
r32 SOURCES += main.cpp
Michal Klocek
adds missing files form previous commit
r12