##// 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
qmlboxplot.pro
9 lines | 178 B | text/idl | PrologLexer
!include( ../examples.pri ) {
error( "Couldn't find the examples.pri file!" )
}
RESOURCES += resources.qrc
SOURCES += main.cpp
OTHER_FILES += \
qml/qmlboxplot/main.qml