diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2020-01-16 16:25:06 +0100 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2020-01-16 16:25:06 +0100 |
| commit | 1d333d3375874efb8d37df37dc5ef561573794ad (patch) | |
| tree | 2d8c995f64c05c84c1fcceb2c5cb40fcae69855f /examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes | |
| parent | b106d86c433706928b0b0c206a0d9f831681e1bf (diff) | |
| parent | e79a2658cde899d6ee11ec3c0d0a3768eb2c864b (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Change-Id: I0c5b939c70bdb91ccdf7068784308416dcaa5736
Diffstat (limited to 'examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes')
| -rw-r--r-- | examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro | 4 | ||||
| -rw-r--r-- | examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/main.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro b/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro index 12dfbd6280..e277f74676 100644 --- a/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro +++ b/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro @@ -1,5 +1,9 @@ QT += qml quick +CONFIG += qmltypes +QML_IMPORT_NAME = Charts +QML_IMPORT_MAJOR_VERSION = 1 + HEADERS += piechart.h \ pieslice.h SOURCES += piechart.cpp \ diff --git a/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/main.cpp b/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/main.cpp index 7c5d1a6885..76e075a72c 100644 --- a/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/main.cpp +++ b/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/main.cpp @@ -59,10 +59,6 @@ int main(int argc, char *argv[]) //![0] QGuiApplication app(argc, argv); -//![1] - qmlRegisterTypesAndRevisions<PieChart, PieSlice>("Charts", 1); -//![1] - QQuickView view; view.setResizeMode(QQuickView::SizeRootObjectToView); view.setSource(QUrl("qrc:///app.qml")); |