##// 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:

r2820:79a856530b69
r2893:0464d42b101e merge 5.7.0
Show More
xychart.pri
22 lines | 496 B | text/plain | TextLexer
Titta Heikkala
Qt Charts project file structure change...
r2712 #INCLUDEPATH += $$PWD
#DEPENDPATH += $$PWD
Michal Klocek
Add missing files from previous commit
r466
SOURCES += \
Michal Klocek
Refactor xychartitem -> xychart
r1218 $$PWD/xychart.cpp \
Titta Heikkala
Qt Charts project file structure change...
r2712 $$PWD/qxyseries.cpp \
Marek Rosa
Added Vertical and Horizontal QXYModelMapper
r1252 $$PWD/qxymodelmapper.cpp \
$$PWD/qvxymodelmapper.cpp \
Miikka Heikkinen
Accelerating lineseries with OpenGL...
r2820 $$PWD/qhxymodelmapper.cpp \
$$PWD/glxyseriesdata.cpp
Titta Heikkala
Qt Charts project file structure change...
r2712
Michal Klocek
Add missing files from previous commit
r466 PRIVATE_HEADERS += \
Michal Klocek
Refactor xychartitem -> xychart
r1218 $$PWD/xychart_p.h \
Marek Rosa
XYModelMapper slots for model signals implemented
r1256 $$PWD/qxyseries_p.h \
Miikka Heikkinen
Accelerating lineseries with OpenGL...
r2820 $$PWD/qxymodelmapper_p.h \
$$PWD/glxyseriesdata_p.h
Michal Klocek
Animation refactor...
r530
Titta Heikkala
Qt Charts project file structure change...
r2712 PUBLIC_HEADERS += \
Marek Rosa
Mapper class added for xyseries and pieseries. Model support commented out for barseries for now.
r1164 $$PWD/qxyseries.h \
Marek Rosa
Added Vertical and Horizontal QXYModelMapper
r1252 $$PWD/qxymodelmapper.h \
$$PWD/qvxymodelmapper.h \
$$PWD/qhxymodelmapper.h