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

r2734:69f73db4ec09
r2898:03a6177a3223 merge master
Show More
resources.qrc
30 lines | 1.6 KiB | text/plain | TextLexer
<RCC>
<qresource prefix="/">
<file>qml/qmlchartproperties/main.qml</file>
<file>qml/qmlchartproperties/Button.qml</file>
<file>qml/qmlchartproperties/PieChart.qml</file>
<file>qml/qmlchartproperties/PieEditor.qml</file>
<file>qml/qmlchartproperties/LineChart.qml</file>
<file>qml/qmlchartproperties/LineEditor.qml</file>
<file>qml/qmlchartproperties/SplineChart.qml</file>
<file>qml/qmlchartproperties/ScatterChart.qml</file>
<file>qml/qmlchartproperties/AreaChart.qml</file>
<file>qml/qmlchartproperties/BarChart.qml</file>
<file>qml/qmlchartproperties/BarEditor.qml</file>
<file>qml/qmlchartproperties/ScatterEditor.qml</file>
<file>qml/qmlchartproperties/AreaEditor.qml</file>
<file>qml/qmlchartproperties/StackedBarChart.qml</file>
<file>qml/qmlchartproperties/PercentBarChart.qml</file>
<file>qml/qmlchartproperties/Chart.qml</file>
<file>qml/qmlchartproperties/ChartEditor.qml</file>
<file>qml/qmlchartproperties/FontEditor.qml</file>
<file>qml/qmlchartproperties/HorizontalBarChart.qml</file>
<file>qml/qmlchartproperties/HorizontalPercentBarChart.qml</file>
<file>qml/qmlchartproperties/HorizontalStackedBarChart.qml</file>
<file>qml/qmlchartproperties/ChartEditorAxis.qml</file>
<file>qml/qmlchartproperties/ChartEditorLegend.qml</file>
<file>qml/qmlchartproperties/ChartEditorProperties.qml</file>
<file>qml/qmlchartproperties/ChartEditorTitle.qml</file>
<file>qml/qmlchartproperties/ChartEditorSeries.qml</file>
</qresource>
</RCC>