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

r2861:21c113d296ef
r2898:03a6177a3223 merge master
Show More
chartdataset.pro
8 lines | 192 B | text/idl | PrologLexer
Tero Ahola
Created auto test specific pri
r960 !include( ../auto.pri ) {
error( "Couldn't find the auto.pri file!" )
Michal Klocek
Adds chartdata unit test
r224 }
Tero Ahola
Hacked library dependency issues on OSX
r1035
Titta Heikkala
Qt Charts project file structure change...
r2712 QT += charts-private
Miikka Heikkinen
No longer automatically disable QDateTimeAxis on ARM platforms...
r2861 contains(QT_COORD_TYPE, float): DEFINES += QT_QREAL_IS_FLOAT
Titta Heikkala
Qt Charts project file structure change...
r2712
Michal Klocek
Adds chartdata unit test
r224 SOURCES += tst_chartdataset.cpp