diff options
| -rw-r--r-- | src/imports/shapes/qquickshape.cpp | 10 | ||||
| -rw-r--r-- | src/imports/shapes/qquickshape_p.h | 8 | ||||
| -rw-r--r-- | tests/auto/quick/qquickshape/data/pathitem3.qml | 2 | ||||
| -rw-r--r-- | tests/auto/quick/qquickshape/data/pathitem4.qml | 2 | ||||
| -rw-r--r-- | tests/auto/quick/qquickshape/tst_qquickshape.cpp | 4 |
5 files changed, 13 insertions, 13 deletions
diff --git a/src/imports/shapes/qquickshape.cpp b/src/imports/shapes/qquickshape.cpp index 0d060242b4..4e6896621e 100644 --- a/src/imports/shapes/qquickshape.cpp +++ b/src/imports/shapes/qquickshape.cpp @@ -623,7 +623,7 @@ void QQuickShapePath::resetFillGradient() \c{GL_NV_path_rendering} methods are available. The choice is made at runtime, depending on the graphics driver's capabilities. When this is not desired, applications can force using the generic method by setting the - Shape.enableVendorExtensions property to \c false. + Shape.vendorExtensionsEnabled property to \c false. \li The \c software backend is fully supported. The path is rendered via QPainter::strokePath() and QPainter::fillPath() in this case. @@ -745,7 +745,7 @@ void QQuickShape::setAsynchronous(bool async) } /*! - \qmlproperty bool QtQuick.Shapes::Shape::enableVendorExtensions + \qmlproperty bool QtQuick.Shapes::Shape::vendorExtensionsEnabled This property controls the usage of non-standard OpenGL extensions like GL_NV_path_rendering. To disable Shape.NvprRenderer and force a uniform @@ -755,18 +755,18 @@ void QQuickShape::setAsynchronous(bool async) The default value is \c true. */ -bool QQuickShape::enableVendorExtensions() const +bool QQuickShape::vendorExtensionsEnabled() const { Q_D(const QQuickShape); return d->enableVendorExts; } -void QQuickShape::setEnableVendorExtensions(bool enable) +void QQuickShape::setVendorExtensionsEnabled(bool enable) { Q_D(QQuickShape); if (d->enableVendorExts != enable) { d->enableVendorExts = enable; - emit enableVendorExtensionsChanged(); + emit vendorExtensionsEnabledChanged(); } } diff --git a/src/imports/shapes/qquickshape_p.h b/src/imports/shapes/qquickshape_p.h index c5096be229..db0b449c6c 100644 --- a/src/imports/shapes/qquickshape_p.h +++ b/src/imports/shapes/qquickshape_p.h @@ -225,7 +225,7 @@ class QQuickShape : public QQuickItem Q_OBJECT Q_PROPERTY(RendererType renderer READ rendererType NOTIFY rendererChanged) Q_PROPERTY(bool asynchronous READ asynchronous WRITE setAsynchronous NOTIFY asynchronousChanged) - Q_PROPERTY(bool enableVendorExtensions READ enableVendorExtensions WRITE setEnableVendorExtensions NOTIFY enableVendorExtensionsChanged) + Q_PROPERTY(bool vendorExtensionsEnabled READ vendorExtensionsEnabled WRITE setVendorExtensionsEnabled NOTIFY vendorExtensionsEnabledChanged) Q_PROPERTY(Status status READ status NOTIFY statusChanged) Q_PROPERTY(QQmlListProperty<QObject> data READ data) Q_CLASSINFO("DefaultProperty", "data") @@ -254,8 +254,8 @@ public: bool asynchronous() const; void setAsynchronous(bool async); - bool enableVendorExtensions() const; - void setEnableVendorExtensions(bool enable); + bool vendorExtensionsEnabled() const; + void setVendorExtensionsEnabled(bool enable); Status status() const; @@ -271,7 +271,7 @@ protected: Q_SIGNALS: void rendererChanged(); void asynchronousChanged(); - void enableVendorExtensionsChanged(); + void vendorExtensionsEnabledChanged(); void statusChanged(); private: diff --git a/tests/auto/quick/qquickshape/data/pathitem3.qml b/tests/auto/quick/qquickshape/data/pathitem3.qml index fccd1aa2de..8328f2fc33 100644 --- a/tests/auto/quick/qquickshape/data/pathitem3.qml +++ b/tests/auto/quick/qquickshape/data/pathitem3.qml @@ -6,7 +6,7 @@ Item { height: 150 Shape { - enableVendorExtensions: false + vendorExtensionsEnabled: false objectName: "pathItem" anchors.fill: parent diff --git a/tests/auto/quick/qquickshape/data/pathitem4.qml b/tests/auto/quick/qquickshape/data/pathitem4.qml index 1d769051ee..635113416f 100644 --- a/tests/auto/quick/qquickshape/data/pathitem4.qml +++ b/tests/auto/quick/qquickshape/data/pathitem4.qml @@ -6,7 +6,7 @@ Item { height: 150 Shape { - enableVendorExtensions: false + vendorExtensionsEnabled: false objectName: "pathItem" anchors.fill: parent diff --git a/tests/auto/quick/qquickshape/tst_qquickshape.cpp b/tests/auto/quick/qquickshape/tst_qquickshape.cpp index 4f220cf801..dcc79e6599 100644 --- a/tests/auto/quick/qquickshape/tst_qquickshape.cpp +++ b/tests/auto/quick/qquickshape/tst_qquickshape.cpp @@ -78,7 +78,7 @@ void tst_QQuickShape::initValues() QVERIFY(obj != nullptr); QVERIFY(obj->rendererType() == QQuickShape::UnknownRenderer); QVERIFY(!obj->asynchronous()); - QVERIFY(obj->enableVendorExtensions()); + QVERIFY(obj->vendorExtensionsEnabled()); QVERIFY(obj->status() == QQuickShape::Null); auto vps = obj->data(); QVERIFY(vps.count(&vps) == 0); @@ -95,7 +95,7 @@ void tst_QQuickShape::vpInitValues() QVERIFY(obj != nullptr); QVERIFY(obj->rendererType() == QQuickShape::UnknownRenderer); QVERIFY(!obj->asynchronous()); - QVERIFY(obj->enableVendorExtensions()); + QVERIFY(obj->vendorExtensionsEnabled()); QVERIFY(obj->status() == QQuickShape::Null); auto vps = obj->data(); QVERIFY(vps.count(&vps) == 2); |