diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-10 15:09:37 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-12 15:03:03 +0100 |
| commit | 26c5243491f495194f04b449128dae36118e28da (patch) | |
| tree | 7fb14678a6fc9e44a10c9224d005e2cbdc6bcb63 /examples/qml/tutorials/extending-qml/chapter6-plugins/import/piechart.cpp | |
| parent | 1c7d264e3b2e9a2f0021786ea6967185f8282af0 (diff) | |
| parent | c24c5baeda4101b0058689adf9200b77a722c3a2 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Conflicts:
dependencies.yaml
src/qml/qml/qqmlengine.cpp
Change-Id: I6a73fd1064286f4a2232de85c2ce7f80452d4641
Diffstat (limited to 'examples/qml/tutorials/extending-qml/chapter6-plugins/import/piechart.cpp')
| -rw-r--r-- | examples/qml/tutorials/extending-qml/chapter6-plugins/import/piechart.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/examples/qml/tutorials/extending-qml/chapter6-plugins/import/piechart.cpp b/examples/qml/tutorials/extending-qml/chapter6-plugins/import/piechart.cpp index 1c712c887a..536c0e16ae 100644 --- a/examples/qml/tutorials/extending-qml/chapter6-plugins/import/piechart.cpp +++ b/examples/qml/tutorials/extending-qml/chapter6-plugins/import/piechart.cpp @@ -67,7 +67,8 @@ void PieChart::setName(const QString &name) QQmlListProperty<PieSlice> PieChart::slices() { - return QQmlListProperty<PieSlice>(this, nullptr, &PieChart::append_slice, nullptr, nullptr, nullptr); + return QQmlListProperty<PieSlice>(this, nullptr, &PieChart::append_slice, nullptr, + nullptr, nullptr, nullptr, nullptr); } void PieChart::append_slice(QQmlListProperty<PieSlice> *list, PieSlice *slice) |