diff options
| -rw-r--r-- | src/quickvectorimage/qquickvectorimage.cpp | 8 | ||||
| -rw-r--r-- | src/quickvectorimage/qquickvectorimage_p_p.h | 2 | ||||
| -rw-r--r-- | tests/baseline/scenegraph/scenegrabber/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | tests/baseline/scenegraph/scenegrabber/checkered.png | bin | 0 -> 122 bytes |
4 files changed, 14 insertions, 3 deletions
diff --git a/src/quickvectorimage/qquickvectorimage.cpp b/src/quickvectorimage/qquickvectorimage.cpp index fc4e34f0f2..314accc5fa 100644 --- a/src/quickvectorimage/qquickvectorimage.cpp +++ b/src/quickvectorimage/qquickvectorimage.cpp @@ -19,14 +19,18 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, itemGenPluginLoader, (QQuickVectorImageFormatsPluginFactory_iid, QLatin1String("/vectorimageformats"), Qt::CaseInsensitive)) -static bool useQmlGenerator() +bool QQuickVectorImagePrivate::useQmlGenerator() { + Q_Q(QQuickVectorImage); static const bool val = !qEnvironmentVariableIsSet("QT_QUICKVECTORIMAGE_USE_ITEM_GENERATOR"); - return val; + const bool useNonDefaultGenerator = q->property("_qt_usenondefaultgenerator").toBool(); + return useNonDefaultGenerator ? !val : val; } /*! diff --git a/src/quickvectorimage/qquickvectorimage_p_p.h b/src/quickvectorimage/qquickvectorimage_p_p.h index 3627478108..488cc95bea 100644 --- a/src/quickvectorimage/qquickvectorimage_p_p.h +++ b/src/quickvectorimage/qquickvectorimage_p_p.h @@ -16,7 +16,6 @@ // #include <QQuickPaintedItem> -#include <QSvgRenderer> #include <private/qquickitem_p.h> #include <QtQuickVectorImageGenerator/private/qquickvectorimagesource_p.h> #include "qquickvectorimage_p.h" @@ -34,6 +33,7 @@ public: void setSource(const QUrl &source); void setSourceData(const QByteArray &data); void loadFile(); + bool useQmlGenerator(); static QQuickVectorImagePrivate *get(QQuickVectorImage *q) { diff --git a/tests/baseline/scenegraph/scenegrabber/CMakeLists.txt b/tests/baseline/scenegraph/scenegrabber/CMakeLists.txt index 145d98b2ad..5927c8951d 100644 --- a/tests/baseline/scenegraph/scenegrabber/CMakeLists.txt +++ b/tests/baseline/scenegraph/scenegrabber/CMakeLists.txt @@ -23,6 +23,13 @@ qt_internal_add_manual_test(qmlscenegrabber Qt::QuickTemplates2Private ) +qt_add_resources(qmlscenegrabber "qmlscenegrabber" + PREFIX + "/" + FILES + checkered.png +) + qt6_add_shaders(qmlscenegrabber "qmlscenegrabber_shaders" BATCHABLE PREFIX diff --git a/tests/baseline/scenegraph/scenegrabber/checkered.png b/tests/baseline/scenegraph/scenegrabber/checkered.png Binary files differnew file mode 100644 index 0000000000..bce3990347 --- /dev/null +++ b/tests/baseline/scenegraph/scenegrabber/checkered.png |
