##// 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
legend.pri
36 lines | 946 B | text/plain | TextLexer
Michal Klocek
Moves legend src to subdirectory
r957 INCLUDEPATH += $$PWD
DEPENDPATH += $$PWD
SOURCES += \
$$PWD/qlegend.cpp \
sauimone
first prototry of QLegendMarker API
r2160 $$PWD/legendlayout.cpp \
sauimone
new legend example for testing new api. Currently using still the old one.
r2162 $$PWD/qlegendmarker.cpp \
sauimone
added LegendMarkerItem. Updated new legend example to test clicked of LegendMarker
r2164 $$PWD/qpielegendmarker.cpp \
sauimone
tidying up legend marker code. Added QBarLegendMarker
r2174 $$PWD/legendmarkeritem.cpp \
sauimone
added QXYLegendMarker
r2175 $$PWD/qbarlegendmarker.cpp \
sauimone
added QAreaLegendMarker
r2176 $$PWD/qxylegendmarker.cpp \
sauimone
Legend can now handle clicked and do scrolling
r2183 $$PWD/qarealegendmarker.cpp \
Mika Salmela
A new box-and-whiskers series type added to charts....
r2548 $$PWD/legendscroller.cpp \
$$PWD/qboxplotlegendmarker.cpp
Michal Klocek
Moves legend src to subdirectory
r957
PRIVATE_HEADERS += \
$$PWD/legendscroller_p.h \
Michal Klocek
Refactors layout managment...
r1534 $$PWD/qlegend_p.h \
sauimone
Added createLegendMarkers to private series. This will replace old createLegendMarker method. Notice the s in new method name. PIMPL for QLegendMarker. Newlegend example updated a bit
r2163 $$PWD/legendlayout_p.h \
sauimone
added LegendMarkerItem. Updated new legend example to test clicked of LegendMarker
r2164 $$PWD/qlegendmarker_p.h \
sauimone
QPieLegenmarkerPrivate added
r2166 $$PWD/legendmarkeritem_p.h \
sauimone
tidying up legend marker code. Added QBarLegendMarker
r2174 $$PWD/qpielegendmarker_p.h \
sauimone
added QXYLegendMarker
r2175 $$PWD/qbarlegendmarker_p.h \
sauimone
added QAreaLegendMarker
r2176 $$PWD/qxylegendmarker_p.h \
Mika Salmela
A new box-and-whiskers series type added to charts....
r2548 $$PWD/qarealegendmarker_p.h \
$$PWD/qboxplotlegendmarker_p.h
Michal Klocek
Moves legend src to subdirectory
r957
PUBLIC_HEADERS += \
sauimone
first prototry of QLegendMarker API
r2160 $$PWD/qlegend.h \
sauimone
new legend example for testing new api. Currently using still the old one.
r2162 $$PWD/qlegendmarker.h \
sauimone
tidying up legend marker code. Added QBarLegendMarker
r2174 $$PWD/qpielegendmarker.h \
sauimone
added QXYLegendMarker
r2175 $$PWD/qbarlegendmarker.h \
sauimone
added QAreaLegendMarker
r2176 $$PWD/qxylegendmarker.h \
Mika Salmela
A new box-and-whiskers series type added to charts....
r2548 $$PWD/qarealegendmarker.h \
$$PWD/qboxplotlegendmarker.h