##// 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/doc/qtcharts.qdocconf Change-Id: If6160b2f643e7df8c32400b97afac229b95b78de

File last commit:

r2712:c544258484ff
r2893:0464d42b101e merge 5.7.0
Show More
nesteddonuts.pro
8 lines | 165 B | text/idl | PrologLexer
Titta Heikkala
Qt Charts project file structure change...
r2712 !include( ../examples.pri ) {
error( "Couldn't find the examples.pri file!" )
Marek Rosa
Added insert, remove and other common methodds to QDonutGroup. Donut example added
r1693 }
Jani Honkonen
missed a spot with nesteddonuts renaming
r1878 TARGET = nesteddonuts
Marek Rosa
Added insert, remove and other common methodds to QDonutGroup. Donut example added
r1693 SOURCES += main.cpp\
widget.cpp
HEADERS += widget.h