summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBerthold Krevert <berthold.krevert@basyskom.com>2017-07-27 20:09:01 +0200
committerLaszlo Agocs <laszlo.agocs@qt.io>2017-07-28 09:20:06 +0000
commitce5436a9a07b5593529afc0a259e55d5c716e41c (patch)
treebd1fe226548754ff9c331a43ac787032e3fe6e78
parenta2db480db51748b381f18987790b5f2de8c0c911 (diff)
Rename property to rendererType
This follows the documentation. Change-Id: I74d8d2b45546717c6a6b252af9370c6670ef1b78 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
-rw-r--r--examples/quick/shapes/content/pathitemgallery.qml2
-rw-r--r--src/imports/shapes/plugins.qmltypes2
-rw-r--r--src/imports/shapes/qquickshape_p.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/examples/quick/shapes/content/pathitemgallery.qml b/examples/quick/shapes/content/pathitemgallery.qml
index 3b418639ee..e871de4c52 100644
--- a/examples/quick/shapes/content/pathitemgallery.qml
+++ b/examples/quick/shapes/content/pathitemgallery.qml
@@ -180,7 +180,7 @@ Rectangle {
color: "darkBlue"
font.pointSize: 12
property variant rendererStrings: [ "Unknown", "Generic (QtGui triangulator)", "GL_NV_path_rendering", "Software (QPainter)" ]
- text: "Active Shape backend: " + rendererStrings[dummyShape.renderer]
+ text: "Active Shape backend: " + rendererStrings[dummyShape.rendererType]
SequentialAnimation on opacity {
NumberAnimation { from: 1; to: 0; duration: 5000 }
PauseAnimation { duration: 5000 }
diff --git a/src/imports/shapes/plugins.qmltypes b/src/imports/shapes/plugins.qmltypes
index c7c079991d..b8a7c532e0 100644
--- a/src/imports/shapes/plugins.qmltypes
+++ b/src/imports/shapes/plugins.qmltypes
@@ -31,7 +31,7 @@ Module {
"Processing": 2
}
}
- Property { name: "renderer"; type: "RendererType"; isReadonly: true }
+ Property { name: "rendererType"; type: "RendererType"; isReadonly: true }
Property { name: "asynchronous"; type: "bool" }
Property { name: "vendorExtensionsEnabled"; type: "bool" }
Property { name: "status"; type: "Status"; isReadonly: true }
diff --git a/src/imports/shapes/qquickshape_p.h b/src/imports/shapes/qquickshape_p.h
index db0b449c6c..3a630aacbc 100644
--- a/src/imports/shapes/qquickshape_p.h
+++ b/src/imports/shapes/qquickshape_p.h
@@ -223,7 +223,7 @@ private:
class QQuickShape : public QQuickItem
{
Q_OBJECT
- Q_PROPERTY(RendererType renderer READ rendererType NOTIFY rendererChanged)
+ Q_PROPERTY(RendererType rendererType READ rendererType NOTIFY rendererChanged)
Q_PROPERTY(bool asynchronous READ asynchronous WRITE setAsynchronous NOTIFY asynchronousChanged)
Q_PROPERTY(bool vendorExtensionsEnabled READ vendorExtensionsEnabled WRITE setVendorExtensionsEnabled NOTIFY vendorExtensionsEnabledChanged)
Q_PROPERTY(Status status READ status NOTIFY statusChanged)