aboutsummaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.agocs@qt.io>2017-07-28 11:28:57 +0200
committerLaszlo Agocs <laszlo.agocs@qt.io>2017-08-09 09:07:50 +0000
commit9b480bade6250a6923a616ae1e7309d17b9d28ee (patch)
treee466c6f329c4be178b1b18d58a65be8dcfb436bd /examples
parente8161969828a67584fa3ab1cdb2bd79eb447c1da (diff)
Rename shape example files to get rid of the old pathitem term
QQuickShape used to be known as QQuickPathItem. Avoid the old name in publicly exposed components. Change-Id: I70bed142e1e82c48c496ab98384318e08fba99c7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'examples')
-rw-r--r--examples/quick/shapes/content/clippedtigers.qml (renamed from examples/quick/shapes/content/pathitemtigers.qml)0
-rw-r--r--examples/quick/shapes/content/interactive.qml (renamed from examples/quick/shapes/content/pathiteminteract.qml)0
-rw-r--r--examples/quick/shapes/content/main.qml (renamed from examples/quick/shapes/content/pathitem.qml)8
-rw-r--r--examples/quick/shapes/content/sampling.qml (renamed from examples/quick/shapes/content/pathitemsampling.qml)0
-rw-r--r--examples/quick/shapes/content/shapegallery.qml (renamed from examples/quick/shapes/content/pathitemgallery.qml)0
-rw-r--r--examples/quick/shapes/main.cpp2
-rw-r--r--examples/quick/shapes/shapes.pro10
-rw-r--r--examples/quick/shapes/shapes.qrc12
8 files changed, 16 insertions, 16 deletions
diff --git a/examples/quick/shapes/content/pathitemtigers.qml b/examples/quick/shapes/content/clippedtigers.qml
index c55efdc403..c55efdc403 100644
--- a/examples/quick/shapes/content/pathitemtigers.qml
+++ b/examples/quick/shapes/content/clippedtigers.qml
diff --git a/examples/quick/shapes/content/pathiteminteract.qml b/examples/quick/shapes/content/interactive.qml
index 55a1d16299..55a1d16299 100644
--- a/examples/quick/shapes/content/pathiteminteract.qml
+++ b/examples/quick/shapes/content/interactive.qml
diff --git a/examples/quick/shapes/content/pathitem.qml b/examples/quick/shapes/content/main.qml
index e9c7ce4547..8efa47d30b 100644
--- a/examples/quick/shapes/content/pathitem.qml
+++ b/examples/quick/shapes/content/main.qml
@@ -56,10 +56,10 @@ Item {
LauncherList {
anchors.fill: parent
Component.onCompleted: {
- addExample("Shape Gallery", "Simple path rendering examples", Qt.resolvedUrl("pathitemgallery.qml"))
- addExample("Interactive Shape", "Dynamic, interactive path rendering examples", Qt.resolvedUrl("pathiteminteract.qml"))
- addExample("Super- and multisampling", "Improving quality", Qt.resolvedUrl("pathitemsampling.qml"))
- addExample("Clip My Tiger!", "Clip examples, a.k.a. What Not To Do", Qt.resolvedUrl("pathitemtigers.qml"))
+ addExample("Shape Gallery", "Simple path rendering examples", Qt.resolvedUrl("shapegallery.qml"))
+ addExample("Interactive Shape", "Dynamic, interactive path rendering examples", Qt.resolvedUrl("interactive.qml"))
+ addExample("Super- and multisampling", "Improving quality", Qt.resolvedUrl("sampling.qml"))
+ addExample("Clip My Tiger!", "Clip examples, a.k.a. What Not To Do", Qt.resolvedUrl("clippedtigers.qml"))
}
}
}
diff --git a/examples/quick/shapes/content/pathitemsampling.qml b/examples/quick/shapes/content/sampling.qml
index 6b651f8a1d..6b651f8a1d 100644
--- a/examples/quick/shapes/content/pathitemsampling.qml
+++ b/examples/quick/shapes/content/sampling.qml
diff --git a/examples/quick/shapes/content/pathitemgallery.qml b/examples/quick/shapes/content/shapegallery.qml
index 4096743833..4096743833 100644
--- a/examples/quick/shapes/content/pathitemgallery.qml
+++ b/examples/quick/shapes/content/shapegallery.qml
diff --git a/examples/quick/shapes/main.cpp b/examples/quick/shapes/main.cpp
index 3a81c4da05..114314fb19 100644
--- a/examples/quick/shapes/main.cpp
+++ b/examples/quick/shapes/main.cpp
@@ -38,4 +38,4 @@
**
****************************************************************************/
#include "../shared/shared.h"
-DECLARATIVE_EXAMPLE_MAIN(pathitem/pathitem)
+DECLARATIVE_EXAMPLE_MAIN(shapes/main)
diff --git a/examples/quick/shapes/shapes.pro b/examples/quick/shapes/shapes.pro
index d884c0e8eb..c28359b13c 100644
--- a/examples/quick/shapes/shapes.pro
+++ b/examples/quick/shapes/shapes.pro
@@ -3,11 +3,11 @@ TEMPLATE = app
QT += quick qml
SOURCES += main.cpp
RESOURCES += shapes.qrc
-OTHER_FILES += content/pathitem.qml \
- content/pathitemgallery.qml \
- content/pathiteminteract.qml \
- content/pathitemsampling.qml \
- content/pathitemtigers.qml \
+OTHER_FILES += content/main.qml \
+ content/shapegallery.qml \
+ content/interactive.qml \
+ content/sampling.qml \
+ content/clippedtigers.qml \
content/tiger.qml \
content/item1.qml \
content/item2.qml \
diff --git a/examples/quick/shapes/shapes.qrc b/examples/quick/shapes/shapes.qrc
index 388fb867dd..5a0edd9f8f 100644
--- a/examples/quick/shapes/shapes.qrc
+++ b/examples/quick/shapes/shapes.qrc
@@ -1,16 +1,16 @@
<RCC>
- <qresource prefix="/pathitem">
+ <qresource prefix="/shapes">
<file alias="LauncherList.qml">../shared/LauncherList.qml</file>
<file alias="SimpleLauncherDelegate.qml">../shared/SimpleLauncherDelegate.qml</file>
<file alias="images/next.png">../shared/images/next.png</file>
<file alias="images/back.png">../shared/images/back.png</file>
<file alias="images/slider_handle.png">../shared/images/slider_handle.png</file>
<file alias="Slider.qml">../shared/Slider.qml</file>
- <file alias="pathitem.qml">content/pathitem.qml</file>
- <file alias="pathitemgallery.qml">content/pathitemgallery.qml</file>
- <file alias="pathiteminteract.qml">content/pathiteminteract.qml</file>
- <file alias="pathitemsampling.qml">content/pathitemsampling.qml</file>
- <file alias="pathitemtigers.qml">content/pathitemtigers.qml</file>
+ <file alias="main.qml">content/main.qml</file>
+ <file alias="shapegallery.qml">content/shapegallery.qml</file>
+ <file alias="interactive.qml">content/interactive.qml</file>
+ <file alias="sampling.qml">content/sampling.qml</file>
+ <file alias="clippedtigers.qml">content/clippedtigers.qml</file>
<file alias="tiger.qml">content/tiger.qml</file>
<file alias="item1.qml">content/item1.qml</file>
<file alias="item2.qml">content/item2.qml</file>