##// END OF EJS Templates
Merge remote-tracking branch 'origin/5.6' into 5.7...
Merge remote-tracking branch 'origin/5.6' into 5.7 Conflicts: src/charts/charts.pro src/charts/qchartglobal.h src/chartsqml2/chartsqml2.pro tests/auto/chartdataset/tst_chartdataset.cpp tests/auto/domain/tst_domain.cpp Change-Id: I9bfc63f6e93f9a3b86e53aca218dd3a48bb2ffc1

File last commit:

r2712:c544258484ff
r2898:03a6177a3223 merge master
Show More
callout.pro
15 lines | 235 B | text/idl | PrologLexer
Titta Heikkala
Qt Charts project file structure change...
r2712 !include( ../examples.pri ) {
Marek Rosa
Added callout example (Drawing on top of chart)
r2150 error( "Couldn't find the examples.pri file!" )
}
TARGET = callout
TEMPLATE = app
Marek Rosa
Updated callout example
r2346 SOURCES += \
main.cpp\
callout.cpp \
view.cpp
Marek Rosa
Added callout example (Drawing on top of chart)
r2150
Marek Rosa
Updated callout example
r2346 HEADERS += \
callout.h \
view.h