diff options
author | Topi Reinio <topi.reinio@digia.com> | 2014-09-26 15:00:14 +0200 |
---|---|---|
committer | Topi Reiniƶ <topi.reinio@digia.com> | 2014-09-30 12:33:22 +0200 |
commit | fccf0e29120f64a8b9b2a15b33971a648ab190e7 (patch) | |
tree | 5e68eea9f4303408c93771596a28031de060e8cf /examples/qml | |
parent | c2c710e5a8d66fa696276aa69c2e3b00436eefe5 (diff) |
Doc: Combine the extending QML tutorial chapters into a single example
Combine the six examples associated with each tutorial chapter
into a single, top-level example project 'extending-qml', with
subprojects for each of the tutorial chapters.
Clean up the docs, add links, and a note about a warning that
the user may see when running the code in the first chapter.
Task-number: QTBUG-32947
Change-Id: Idba4e2153817ab29f1afaf1947d1f2e25964e7b3
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Diffstat (limited to 'examples/qml')
-rw-r--r-- | examples/qml/tutorials/extending-qml/chapter1-basics/app.qml (renamed from examples/qml/tutorials/extending/chapter1-basics/app.qml) | 0 | ||||
-rw-r--r-- | examples/qml/tutorials/extending-qml/chapter1-basics/chapter1-basics.pro (renamed from examples/qml/tutorials/extending/chapter1-basics/chapter1-basics.pro) | 2 | ||||
-rw-r--r-- | examples/qml/tutorials/extending-qml/chapter1-basics/chapter1-basics.qrc (renamed from examples/qml/tutorials/extending/chapter1-basics/chapter1-basics.qrc) | 0 | ||||
-rw-r--r-- | examples/qml/tutorials/extending-qml/chapter1-basics/main.cpp (renamed from examples/qml/tutorials/extending/chapter1-basics/main.cpp) | 0 | ||||
-rw-r--r-- | examples/qml/tutorials/extending-qml/chapter1-basics/piechart.cpp (renamed from examples/qml/tutorials/extending/chapter1-basics/piechart.cpp) | 0 | ||||
-rw-r--r-- | examples/qml/tutorials/extending-qml/chapter1-basics/piechart.h (renamed from examples/qml/tutorials/extending/chapter1-basics/piechart.h) | 0 | ||||
-rw-r--r-- | examples/qml/tutorials/extending-qml/chapter2-methods/app.qml (renamed from examples/qml/tutorials/extending/chapter2-methods/app.qml) | 0 | ||||
-rw-r--r-- | examples/qml/tutorials/extending-qml/chapter2-methods/chapter2-methods.pro (renamed from examples/qml/tutorials/extending/chapter2-methods/chapter2-methods.pro) | 2 | ||||
-rw-r--r-- | examples/qml/tutorials/extending-qml/chapter2-methods/chapter2-methods.qrc (renamed from examples/qml/tutorials/extending/chapter2-methods/chapter2-methods.qrc) | 0 | ||||
-rw-r--r-- | examples/qml/tutorials/extending-qml/chapter2-methods/main.cpp (renamed from examples/qml/tutorials/extending/chapter2-methods/main.cpp) | 0 | ||||
-rw-r--r-- | examples/qml/tutorials/extending-qml/chapter2-methods/piechart.cpp (renamed from examples/qml/tutorials/extending/chapter2-methods/piechart.cpp) | 0 | ||||
-rw-r--r-- | examples/qml/tutorials/extending-qml/chapter2-methods/piechart.h (renamed from examples/qml/tutorials/extending/chapter2-methods/piechart.h) | 0 | ||||
-rw-r--r-- | examples/qml/tutorials/extending-qml/chapter3-bindings/app.qml (renamed from examples/qml/tutorials/extending/chapter3-bindings/app.qml) | 0 | ||||
-rw-r--r-- | examples/qml/tutorials/extending-qml/chapter3-bindings/chapter3-binding.qrc (renamed from examples/qml/tutorials/extending/chapter3-bindings/chapter3-binding.qrc) | 0 | ||||
-rw-r--r-- | examples/qml/tutorials/extending-qml/chapter3-bindings/chapter3-bindings.pro (renamed from examples/qml/tutorials/extending/chapter3-bindings/chapter3-bindings.pro) | 2 | ||||
-rw-r--r-- | examples/qml/tutorials/extending-qml/chapter3-bindings/main.cpp (renamed from examples/qml/tutorials/extending/chapter3-bindings/main.cpp) | 0 | ||||
-rw-r--r-- | examples/qml/tutorials/extending-qml/chapter3-bindings/piechart.cpp (renamed from examples/qml/tutorials/extending/chapter3-bindings/piechart.cpp) | 0 | ||||
-rw-r--r-- | examples/qml/tutorials/extending-qml/chapter3-bindings/piechart.h (renamed from examples/qml/tutorials/extending/chapter3-bindings/piechart.h) | 0 | ||||
-rw-r--r-- | examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/app.qml (renamed from examples/qml/tutorials/extending/chapter4-customPropertyTypes/app.qml) | 0 | ||||
-rw-r--r-- | examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro (renamed from examples/qml/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro) | 2 | ||||
-rw-r--r-- | examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/chapter4-customPropertyTypes.qrc (renamed from examples/qml/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.qrc) | 0 | ||||
-rw-r--r-- | examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/main.cpp (renamed from examples/qml/tutorials/extending/chapter4-customPropertyTypes/main.cpp) | 0 | ||||
-rw-r--r-- | examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/piechart.cpp (renamed from examples/qml/tutorials/extending/chapter4-customPropertyTypes/piechart.cpp) | 0 | ||||
-rw-r--r-- | examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/piechart.h (renamed from examples/qml/tutorials/extending/chapter4-customPropertyTypes/piechart.h) | 0 | ||||
-rw-r--r-- | examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/pieslice.cpp (renamed from examples/qml/tutorials/extending/chapter4-customPropertyTypes/pieslice.cpp) | 0 | ||||
-rw-r--r-- | examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/pieslice.h (renamed from examples/qml/tutorials/extending/chapter4-customPropertyTypes/pieslice.h) | 0 | ||||
-rw-r--r-- | examples/qml/tutorials/extending-qml/chapter5-listproperties/app.qml (renamed from examples/qml/tutorials/extending/chapter5-listproperties/app.qml) | 0 | ||||
-rw-r--r-- | examples/qml/tutorials/extending-qml/chapter5-listproperties/chapter5-listproperties.pro (renamed from examples/qml/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro) | 2 | ||||
-rw-r--r-- | examples/qml/tutorials/extending-qml/chapter5-listproperties/chapter5-listproperties.qrc (renamed from examples/qml/tutorials/extending/chapter5-listproperties/chapter5-listproperties.qrc) | 0 | ||||
-rw-r--r-- | examples/qml/tutorials/extending-qml/chapter5-listproperties/main.cpp (renamed from examples/qml/tutorials/extending/chapter5-listproperties/main.cpp) | 0 | ||||
-rw-r--r-- | examples/qml/tutorials/extending-qml/chapter5-listproperties/piechart.cpp (renamed from examples/qml/tutorials/extending/chapter5-listproperties/piechart.cpp) | 0 | ||||
-rw-r--r-- | examples/qml/tutorials/extending-qml/chapter5-listproperties/piechart.h (renamed from examples/qml/tutorials/extending/chapter5-listproperties/piechart.h) | 0 | ||||
-rw-r--r-- | examples/qml/tutorials/extending-qml/chapter5-listproperties/pieslice.cpp (renamed from examples/qml/tutorials/extending/chapter5-listproperties/pieslice.cpp) | 0 | ||||
-rw-r--r-- | examples/qml/tutorials/extending-qml/chapter5-listproperties/pieslice.h (renamed from examples/qml/tutorials/extending/chapter5-listproperties/pieslice.h) | 0 | ||||
-rw-r--r-- | examples/qml/tutorials/extending-qml/chapter6-plugins/app.pro (renamed from examples/qml/tutorials/extending/chapter6-plugins/app.pro) | 0 | ||||
-rw-r--r-- | examples/qml/tutorials/extending-qml/chapter6-plugins/app.qml (renamed from examples/qml/tutorials/extending/chapter6-plugins/app.qml) | 0 | ||||
-rw-r--r-- | examples/qml/tutorials/extending-qml/chapter6-plugins/app.qrc (renamed from examples/qml/tutorials/extending/chapter6-plugins/app.qrc) | 0 | ||||
-rw-r--r-- | examples/qml/tutorials/extending-qml/chapter6-plugins/chapter6-plugins.pro (renamed from examples/qml/tutorials/extending/chapter6-plugins/chapter6-plugins.pro) | 0 | ||||
-rw-r--r-- | examples/qml/tutorials/extending-qml/chapter6-plugins/import/chartsplugin.cpp (renamed from examples/qml/tutorials/extending/chapter6-plugins/import/chartsplugin.cpp) | 0 | ||||
-rw-r--r-- | examples/qml/tutorials/extending-qml/chapter6-plugins/import/chartsplugin.h (renamed from examples/qml/tutorials/extending/chapter6-plugins/import/chartsplugin.h) | 0 | ||||
-rw-r--r-- | examples/qml/tutorials/extending-qml/chapter6-plugins/import/import.pro (renamed from examples/qml/tutorials/extending/chapter6-plugins/import/import.pro) | 2 | ||||
-rw-r--r-- | examples/qml/tutorials/extending-qml/chapter6-plugins/import/piechart.cpp (renamed from examples/qml/tutorials/extending/chapter6-plugins/import/piechart.cpp) | 0 | ||||
-rw-r--r-- | examples/qml/tutorials/extending-qml/chapter6-plugins/import/piechart.h (renamed from examples/qml/tutorials/extending/chapter6-plugins/import/piechart.h) | 0 | ||||
-rw-r--r-- | examples/qml/tutorials/extending-qml/chapter6-plugins/import/pieslice.cpp (renamed from examples/qml/tutorials/extending/chapter6-plugins/import/pieslice.cpp) | 0 | ||||
-rw-r--r-- | examples/qml/tutorials/extending-qml/chapter6-plugins/import/pieslice.h (renamed from examples/qml/tutorials/extending/chapter6-plugins/import/pieslice.h) | 0 | ||||
-rw-r--r-- | examples/qml/tutorials/extending-qml/chapter6-plugins/import/qmldir (renamed from examples/qml/tutorials/extending/chapter6-plugins/import/qmldir) | 0 | ||||
-rw-r--r-- | examples/qml/tutorials/extending-qml/chapter6-plugins/main.cpp (renamed from examples/qml/tutorials/extending/chapter6-plugins/main.cpp) | 0 | ||||
-rw-r--r-- | examples/qml/tutorials/extending-qml/extending-qml.pro (renamed from examples/qml/tutorials/extending/extending.pro) | 0 |
48 files changed, 6 insertions, 6 deletions
diff --git a/examples/qml/tutorials/extending/chapter1-basics/app.qml b/examples/qml/tutorials/extending-qml/chapter1-basics/app.qml index d2f03daf83..d2f03daf83 100644 --- a/examples/qml/tutorials/extending/chapter1-basics/app.qml +++ b/examples/qml/tutorials/extending-qml/chapter1-basics/app.qml diff --git a/examples/qml/tutorials/extending/chapter1-basics/chapter1-basics.pro b/examples/qml/tutorials/extending-qml/chapter1-basics/chapter1-basics.pro index c28664ea51..9911e02484 100644 --- a/examples/qml/tutorials/extending/chapter1-basics/chapter1-basics.pro +++ b/examples/qml/tutorials/extending-qml/chapter1-basics/chapter1-basics.pro @@ -6,7 +6,7 @@ SOURCES += piechart.cpp \ RESOURCES += chapter1-basics.qrc -DESTPATH = $$[QT_INSTALL_EXAMPLES]/qml/tutorials/extending/chapter1-basics +DESTPATH = $$[QT_INSTALL_EXAMPLES]/qml/tutorials/extending-qml/chapter1-basics target.path = $$DESTPATH qml.files = *.qml diff --git a/examples/qml/tutorials/extending/chapter1-basics/chapter1-basics.qrc b/examples/qml/tutorials/extending-qml/chapter1-basics/chapter1-basics.qrc index f1168aef3b..f1168aef3b 100644 --- a/examples/qml/tutorials/extending/chapter1-basics/chapter1-basics.qrc +++ b/examples/qml/tutorials/extending-qml/chapter1-basics/chapter1-basics.qrc diff --git a/examples/qml/tutorials/extending/chapter1-basics/main.cpp b/examples/qml/tutorials/extending-qml/chapter1-basics/main.cpp index 4e719d2722..4e719d2722 100644 --- a/examples/qml/tutorials/extending/chapter1-basics/main.cpp +++ b/examples/qml/tutorials/extending-qml/chapter1-basics/main.cpp diff --git a/examples/qml/tutorials/extending/chapter1-basics/piechart.cpp b/examples/qml/tutorials/extending-qml/chapter1-basics/piechart.cpp index fa005781d8..fa005781d8 100644 --- a/examples/qml/tutorials/extending/chapter1-basics/piechart.cpp +++ b/examples/qml/tutorials/extending-qml/chapter1-basics/piechart.cpp diff --git a/examples/qml/tutorials/extending/chapter1-basics/piechart.h b/examples/qml/tutorials/extending-qml/chapter1-basics/piechart.h index a6272453ce..a6272453ce 100644 --- a/examples/qml/tutorials/extending/chapter1-basics/piechart.h +++ b/examples/qml/tutorials/extending-qml/chapter1-basics/piechart.h diff --git a/examples/qml/tutorials/extending/chapter2-methods/app.qml b/examples/qml/tutorials/extending-qml/chapter2-methods/app.qml index 06ecb3a09d..06ecb3a09d 100644 --- a/examples/qml/tutorials/extending/chapter2-methods/app.qml +++ b/examples/qml/tutorials/extending-qml/chapter2-methods/app.qml diff --git a/examples/qml/tutorials/extending/chapter2-methods/chapter2-methods.pro b/examples/qml/tutorials/extending-qml/chapter2-methods/chapter2-methods.pro index a451c775cf..7fd850ce36 100644 --- a/examples/qml/tutorials/extending/chapter2-methods/chapter2-methods.pro +++ b/examples/qml/tutorials/extending-qml/chapter2-methods/chapter2-methods.pro @@ -6,7 +6,7 @@ SOURCES += piechart.cpp \ RESOURCES += chapter2-methods.qrc -DESTPATH = $$[QT_INSTALL_EXAMPLES]/qml/tutorials/extending/chapter2-methods +DESTPATH = $$[QT_INSTALL_EXAMPLES]/qml/tutorials/extending-qml/chapter2-methods target.path = $$DESTPATH qml.files = *.qml diff --git a/examples/qml/tutorials/extending/chapter2-methods/chapter2-methods.qrc b/examples/qml/tutorials/extending-qml/chapter2-methods/chapter2-methods.qrc index f1168aef3b..f1168aef3b 100644 --- a/examples/qml/tutorials/extending/chapter2-methods/chapter2-methods.qrc +++ b/examples/qml/tutorials/extending-qml/chapter2-methods/chapter2-methods.qrc diff --git a/examples/qml/tutorials/extending/chapter2-methods/main.cpp b/examples/qml/tutorials/extending-qml/chapter2-methods/main.cpp index 4e719d2722..4e719d2722 100644 --- a/examples/qml/tutorials/extending/chapter2-methods/main.cpp +++ b/examples/qml/tutorials/extending-qml/chapter2-methods/main.cpp diff --git a/examples/qml/tutorials/extending/chapter2-methods/piechart.cpp b/examples/qml/tutorials/extending-qml/chapter2-methods/piechart.cpp index ddcb1b3efd..ddcb1b3efd 100644 --- a/examples/qml/tutorials/extending/chapter2-methods/piechart.cpp +++ b/examples/qml/tutorials/extending-qml/chapter2-methods/piechart.cpp diff --git a/examples/qml/tutorials/extending/chapter2-methods/piechart.h b/examples/qml/tutorials/extending-qml/chapter2-methods/piechart.h index 86750197d2..86750197d2 100644 --- a/examples/qml/tutorials/extending/chapter2-methods/piechart.h +++ b/examples/qml/tutorials/extending-qml/chapter2-methods/piechart.h diff --git a/examples/qml/tutorials/extending/chapter3-bindings/app.qml b/examples/qml/tutorials/extending-qml/chapter3-bindings/app.qml index afb9e25c51..afb9e25c51 100644 --- a/examples/qml/tutorials/extending/chapter3-bindings/app.qml +++ b/examples/qml/tutorials/extending-qml/chapter3-bindings/app.qml diff --git a/examples/qml/tutorials/extending/chapter3-bindings/chapter3-binding.qrc b/examples/qml/tutorials/extending-qml/chapter3-bindings/chapter3-binding.qrc index f1168aef3b..f1168aef3b 100644 --- a/examples/qml/tutorials/extending/chapter3-bindings/chapter3-binding.qrc +++ b/examples/qml/tutorials/extending-qml/chapter3-bindings/chapter3-binding.qrc diff --git a/examples/qml/tutorials/extending/chapter3-bindings/chapter3-bindings.pro b/examples/qml/tutorials/extending-qml/chapter3-bindings/chapter3-bindings.pro index 6193f466c1..0c31592eeb 100644 --- a/examples/qml/tutorials/extending/chapter3-bindings/chapter3-bindings.pro +++ b/examples/qml/tutorials/extending-qml/chapter3-bindings/chapter3-bindings.pro @@ -6,7 +6,7 @@ SOURCES += piechart.cpp \ RESOURCES += chapter3-binding.qrc -DESTPATH = $$[QT_INSTALL_EXAMPLES]/qml/tutorials/extending/chapter3-binding +DESTPATH = $$[QT_INSTALL_EXAMPLES]/qml/tutorials/extending-qml/chapter3-binding target.path = $$DESTPATH qml.files = *.qml diff --git a/examples/qml/tutorials/extending/chapter3-bindings/main.cpp b/examples/qml/tutorials/extending-qml/chapter3-bindings/main.cpp index 4e719d2722..4e719d2722 100644 --- a/examples/qml/tutorials/extending/chapter3-bindings/main.cpp +++ b/examples/qml/tutorials/extending-qml/chapter3-bindings/main.cpp diff --git a/examples/qml/tutorials/extending/chapter3-bindings/piechart.cpp b/examples/qml/tutorials/extending-qml/chapter3-bindings/piechart.cpp index a63035033f..a63035033f 100644 --- a/examples/qml/tutorials/extending/chapter3-bindings/piechart.cpp +++ b/examples/qml/tutorials/extending-qml/chapter3-bindings/piechart.cpp diff --git a/examples/qml/tutorials/extending/chapter3-bindings/piechart.h b/examples/qml/tutorials/extending-qml/chapter3-bindings/piechart.h index 25e82d66cc..25e82d66cc 100644 --- a/examples/qml/tutorials/extending/chapter3-bindings/piechart.h +++ b/examples/qml/tutorials/extending-qml/chapter3-bindings/piechart.h diff --git a/examples/qml/tutorials/extending/chapter4-customPropertyTypes/app.qml b/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/app.qml index c757fdaedd..c757fdaedd 100644 --- a/examples/qml/tutorials/extending/chapter4-customPropertyTypes/app.qml +++ b/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/app.qml diff --git a/examples/qml/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro b/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro index 1742334107..12dfbd6280 100644 --- a/examples/qml/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro +++ b/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro @@ -8,7 +8,7 @@ SOURCES += piechart.cpp \ RESOURCES += chapter4-customPropertyTypes.qrc -DESTPATH = $$[QT_INSTALL_EXAMPLES]/qml/tutorials/extending/chapter4-customPropertyTypes +DESTPATH = $$[QT_INSTALL_EXAMPLES]/qml/tutorials/extending-qml/chapter4-customPropertyTypes target.path = $$DESTPATH qml.files = *.qml diff --git a/examples/qml/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.qrc b/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/chapter4-customPropertyTypes.qrc index f1168aef3b..f1168aef3b 100644 --- a/examples/qml/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.qrc +++ b/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/chapter4-customPropertyTypes.qrc diff --git a/examples/qml/tutorials/extending/chapter4-customPropertyTypes/main.cpp b/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/main.cpp index fc59a11987..fc59a11987 100644 --- a/examples/qml/tutorials/extending/chapter4-customPropertyTypes/main.cpp +++ b/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/main.cpp diff --git a/examples/qml/tutorials/extending/chapter4-customPropertyTypes/piechart.cpp b/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/piechart.cpp index c1e2996e83..c1e2996e83 100644 --- a/examples/qml/tutorials/extending/chapter4-customPropertyTypes/piechart.cpp +++ b/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/piechart.cpp diff --git a/examples/qml/tutorials/extending/chapter4-customPropertyTypes/piechart.h b/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/piechart.h index 9f0ea47eb9..9f0ea47eb9 100644 --- a/examples/qml/tutorials/extending/chapter4-customPropertyTypes/piechart.h +++ b/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/piechart.h diff --git a/examples/qml/tutorials/extending/chapter4-customPropertyTypes/pieslice.cpp b/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/pieslice.cpp index 2afe82048f..2afe82048f 100644 --- a/examples/qml/tutorials/extending/chapter4-customPropertyTypes/pieslice.cpp +++ b/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/pieslice.cpp diff --git a/examples/qml/tutorials/extending/chapter4-customPropertyTypes/pieslice.h b/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/pieslice.h index 4eef9bb6d1..4eef9bb6d1 100644 --- a/examples/qml/tutorials/extending/chapter4-customPropertyTypes/pieslice.h +++ b/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/pieslice.h diff --git a/examples/qml/tutorials/extending/chapter5-listproperties/app.qml b/examples/qml/tutorials/extending-qml/chapter5-listproperties/app.qml index 68aa6e0c1d..68aa6e0c1d 100644 --- a/examples/qml/tutorials/extending/chapter5-listproperties/app.qml +++ b/examples/qml/tutorials/extending-qml/chapter5-listproperties/app.qml diff --git a/examples/qml/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro b/examples/qml/tutorials/extending-qml/chapter5-listproperties/chapter5-listproperties.pro index ba51dd9093..67d1cd35c3 100644 --- a/examples/qml/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro +++ b/examples/qml/tutorials/extending-qml/chapter5-listproperties/chapter5-listproperties.pro @@ -8,7 +8,7 @@ SOURCES += piechart.cpp \ RESOURCES += chapter5-listproperties.qrc -DESTPATH = $$[QT_INSTALL_EXAMPLES]/qml/tutorials/extending/chapter5-listproperties +DESTPATH = $$[QT_INSTALL_EXAMPLES]/qml/tutorials/extending-qml/chapter5-listproperties target.path = $$DESTPATH qml.files = *.qml diff --git a/examples/qml/tutorials/extending/chapter5-listproperties/chapter5-listproperties.qrc b/examples/qml/tutorials/extending-qml/chapter5-listproperties/chapter5-listproperties.qrc index f1168aef3b..f1168aef3b 100644 --- a/examples/qml/tutorials/extending/chapter5-listproperties/chapter5-listproperties.qrc +++ b/examples/qml/tutorials/extending-qml/chapter5-listproperties/chapter5-listproperties.qrc diff --git a/examples/qml/tutorials/extending/chapter5-listproperties/main.cpp b/examples/qml/tutorials/extending-qml/chapter5-listproperties/main.cpp index 8a4afcf96d..8a4afcf96d 100644 --- a/examples/qml/tutorials/extending/chapter5-listproperties/main.cpp +++ b/examples/qml/tutorials/extending-qml/chapter5-listproperties/main.cpp diff --git a/examples/qml/tutorials/extending/chapter5-listproperties/piechart.cpp b/examples/qml/tutorials/extending-qml/chapter5-listproperties/piechart.cpp index 9fb61d9cd8..9fb61d9cd8 100644 --- a/examples/qml/tutorials/extending/chapter5-listproperties/piechart.cpp +++ b/examples/qml/tutorials/extending-qml/chapter5-listproperties/piechart.cpp diff --git a/examples/qml/tutorials/extending/chapter5-listproperties/piechart.h b/examples/qml/tutorials/extending-qml/chapter5-listproperties/piechart.h index 55488f4900..55488f4900 100644 --- a/examples/qml/tutorials/extending/chapter5-listproperties/piechart.h +++ b/examples/qml/tutorials/extending-qml/chapter5-listproperties/piechart.h diff --git a/examples/qml/tutorials/extending/chapter5-listproperties/pieslice.cpp b/examples/qml/tutorials/extending-qml/chapter5-listproperties/pieslice.cpp index 52b409aa22..52b409aa22 100644 --- a/examples/qml/tutorials/extending/chapter5-listproperties/pieslice.cpp +++ b/examples/qml/tutorials/extending-qml/chapter5-listproperties/pieslice.cpp diff --git a/examples/qml/tutorials/extending/chapter5-listproperties/pieslice.h b/examples/qml/tutorials/extending-qml/chapter5-listproperties/pieslice.h index f324179481..f324179481 100644 --- a/examples/qml/tutorials/extending/chapter5-listproperties/pieslice.h +++ b/examples/qml/tutorials/extending-qml/chapter5-listproperties/pieslice.h diff --git a/examples/qml/tutorials/extending/chapter6-plugins/app.pro b/examples/qml/tutorials/extending-qml/chapter6-plugins/app.pro index c55db00d27..c55db00d27 100644 --- a/examples/qml/tutorials/extending/chapter6-plugins/app.pro +++ b/examples/qml/tutorials/extending-qml/chapter6-plugins/app.pro diff --git a/examples/qml/tutorials/extending/chapter6-plugins/app.qml b/examples/qml/tutorials/extending-qml/chapter6-plugins/app.qml index d5a474b8d3..d5a474b8d3 100644 --- a/examples/qml/tutorials/extending/chapter6-plugins/app.qml +++ b/examples/qml/tutorials/extending-qml/chapter6-plugins/app.qml diff --git a/examples/qml/tutorials/extending/chapter6-plugins/app.qrc b/examples/qml/tutorials/extending-qml/chapter6-plugins/app.qrc index f1168aef3b..f1168aef3b 100644 --- a/examples/qml/tutorials/extending/chapter6-plugins/app.qrc +++ b/examples/qml/tutorials/extending-qml/chapter6-plugins/app.qrc diff --git a/examples/qml/tutorials/extending/chapter6-plugins/chapter6-plugins.pro b/examples/qml/tutorials/extending-qml/chapter6-plugins/chapter6-plugins.pro index f858c80876..f858c80876 100644 --- a/examples/qml/tutorials/extending/chapter6-plugins/chapter6-plugins.pro +++ b/examples/qml/tutorials/extending-qml/chapter6-plugins/chapter6-plugins.pro diff --git a/examples/qml/tutorials/extending/chapter6-plugins/import/chartsplugin.cpp b/examples/qml/tutorials/extending-qml/chapter6-plugins/import/chartsplugin.cpp index fea4c1aa85..fea4c1aa85 100644 --- a/examples/qml/tutorials/extending/chapter6-plugins/import/chartsplugin.cpp +++ b/examples/qml/tutorials/extending-qml/chapter6-plugins/import/chartsplugin.cpp diff --git a/examples/qml/tutorials/extending/chapter6-plugins/import/chartsplugin.h b/examples/qml/tutorials/extending-qml/chapter6-plugins/import/chartsplugin.h index d768306967..d768306967 100644 --- a/examples/qml/tutorials/extending/chapter6-plugins/import/chartsplugin.h +++ b/examples/qml/tutorials/extending-qml/chapter6-plugins/import/chartsplugin.h diff --git a/examples/qml/tutorials/extending/chapter6-plugins/import/import.pro b/examples/qml/tutorials/extending-qml/chapter6-plugins/import/import.pro index 83cfb96ab5..cefcf3b477 100644 --- a/examples/qml/tutorials/extending/chapter6-plugins/import/import.pro +++ b/examples/qml/tutorials/extending-qml/chapter6-plugins/import/import.pro @@ -13,7 +13,7 @@ SOURCES += piechart.cpp \ pieslice.cpp \ chartsplugin.cpp -DESTPATH=$$[QT_INSTALL_EXAMPLES]/qml/tutorials/extending/chapter6-plugins/Charts +DESTPATH=$$[QT_INSTALL_EXAMPLES]/qml/tutorials/extending-qml/chapter6-plugins/Charts target.path=$$DESTPATH qmldir.files=$$PWD/qmldir diff --git a/examples/qml/tutorials/extending/chapter6-plugins/import/piechart.cpp b/examples/qml/tutorials/extending-qml/chapter6-plugins/import/piechart.cpp index 295bb8961d..295bb8961d 100644 --- a/examples/qml/tutorials/extending/chapter6-plugins/import/piechart.cpp +++ b/examples/qml/tutorials/extending-qml/chapter6-plugins/import/piechart.cpp diff --git a/examples/qml/tutorials/extending/chapter6-plugins/import/piechart.h b/examples/qml/tutorials/extending-qml/chapter6-plugins/import/piechart.h index b37bcdd411..b37bcdd411 100644 --- a/examples/qml/tutorials/extending/chapter6-plugins/import/piechart.h +++ b/examples/qml/tutorials/extending-qml/chapter6-plugins/import/piechart.h diff --git a/examples/qml/tutorials/extending/chapter6-plugins/import/pieslice.cpp b/examples/qml/tutorials/extending-qml/chapter6-plugins/import/pieslice.cpp index 52b409aa22..52b409aa22 100644 --- a/examples/qml/tutorials/extending/chapter6-plugins/import/pieslice.cpp +++ b/examples/qml/tutorials/extending-qml/chapter6-plugins/import/pieslice.cpp diff --git a/examples/qml/tutorials/extending/chapter6-plugins/import/pieslice.h b/examples/qml/tutorials/extending-qml/chapter6-plugins/import/pieslice.h index 0b488b4835..0b488b4835 100644 --- a/examples/qml/tutorials/extending/chapter6-plugins/import/pieslice.h +++ b/examples/qml/tutorials/extending-qml/chapter6-plugins/import/pieslice.h diff --git a/examples/qml/tutorials/extending/chapter6-plugins/import/qmldir b/examples/qml/tutorials/extending-qml/chapter6-plugins/import/qmldir index d9e8471b3c..d9e8471b3c 100644 --- a/examples/qml/tutorials/extending/chapter6-plugins/import/qmldir +++ b/examples/qml/tutorials/extending-qml/chapter6-plugins/import/qmldir diff --git a/examples/qml/tutorials/extending/chapter6-plugins/main.cpp b/examples/qml/tutorials/extending-qml/chapter6-plugins/main.cpp index 60d8c6cd7a..60d8c6cd7a 100644 --- a/examples/qml/tutorials/extending/chapter6-plugins/main.cpp +++ b/examples/qml/tutorials/extending-qml/chapter6-plugins/main.cpp diff --git a/examples/qml/tutorials/extending/extending.pro b/examples/qml/tutorials/extending-qml/extending-qml.pro index a665975382..a665975382 100644 --- a/examples/qml/tutorials/extending/extending.pro +++ b/examples/qml/tutorials/extending-qml/extending-qml.pro |