aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items
diff options
context:
space:
mode:
Diffstat (limited to 'src/quick/items')
-rw-r--r--src/quick/items/context2d/qquickcontext2d.cpp2
-rw-r--r--src/quick/items/qquickrendererinfo.cpp4
-rw-r--r--src/quick/items/qquickrendererinfo_p.h10
-rw-r--r--src/quick/items/qquickwindow.cpp4
-rw-r--r--src/quick/items/qquickwindow.h2
5 files changed, 11 insertions, 11 deletions
diff --git a/src/quick/items/context2d/qquickcontext2d.cpp b/src/quick/items/context2d/qquickcontext2d.cpp
index 93ca8e9358..caec6cb36a 100644
--- a/src/quick/items/context2d/qquickcontext2d.cpp
+++ b/src/quick/items/context2d/qquickcontext2d.cpp
@@ -4094,7 +4094,7 @@ void QQuickContext2D::init(QQuickCanvasItem *canvasItem, const QVariantMap &args
// Disable Framebuffer Object based rendering when not running with OpenGL
if (m_renderTarget == QQuickCanvasItem::FramebufferObject) {
QSGRendererInterface *rif = canvasItem->window()->rendererInterface();
- if (rif && rif->graphicsAPI() != QSGRendererInterface::OpenGL)
+ if (rif && rif->graphicsApi() != QSGRendererInterface::OpenGL)
m_renderTarget = QQuickCanvasItem::Image;
}
diff --git a/src/quick/items/qquickrendererinfo.cpp b/src/quick/items/qquickrendererinfo.cpp
index e41f4ebbae..b31cfd7f94 100644
--- a/src/quick/items/qquickrendererinfo.cpp
+++ b/src/quick/items/qquickrendererinfo.cpp
@@ -96,12 +96,12 @@ QQuickRendererInfo *QQuickRendererInfo::qmlAttachedProperties(QObject *object)
void QQuickRendererInfo::updateInfo()
{
- GraphicsAPI newAPI = Unknown;
+ GraphicsApi newAPI = Unknown;
if (m_window && m_window->isSceneGraphInitialized()) {
QSGRendererInterface *rif = m_window->rendererInterface();
if (rif)
- newAPI = GraphicsAPI(rif->graphicsAPI()); // this function is safe to call on the gui/main thread too
+ newAPI = GraphicsApi(rif->graphicsApi()); // this function is safe to call on the gui/main thread too
}
if (m_api != newAPI) {
diff --git a/src/quick/items/qquickrendererinfo_p.h b/src/quick/items/qquickrendererinfo_p.h
index d76f4010e0..d0298baa21 100644
--- a/src/quick/items/qquickrendererinfo_p.h
+++ b/src/quick/items/qquickrendererinfo_p.h
@@ -63,23 +63,23 @@ class QQuickWindow;
class QQuickRendererInfo : public QObject
{
Q_OBJECT
- Q_PROPERTY(GraphicsAPI api READ api NOTIFY apiChanged FINAL)
+ Q_PROPERTY(GraphicsApi api READ api NOTIFY apiChanged FINAL)
public:
// must match QSGRendererInterface
- enum GraphicsAPI {
+ enum GraphicsApi {
Unknown,
Software,
OpenGL,
Direct3D12
};
- Q_ENUM(GraphicsAPI)
+ Q_ENUM(GraphicsApi)
QQuickRendererInfo(QQuickItem *item = 0);
static QQuickRendererInfo *qmlAttachedProperties(QObject *object);
- GraphicsAPI api() const { return m_api; }
+ GraphicsApi api() const { return m_api; }
Q_SIGNALS:
void apiChanged();
@@ -90,7 +90,7 @@ private Q_SLOTS:
private:
QPointer<QQuickWindow> m_window;
- GraphicsAPI m_api;
+ GraphicsApi m_api;
};
QT_END_NAMESPACE
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp
index 6333bf704a..b3ca563f16 100644
--- a/src/quick/items/qquickwindow.cpp
+++ b/src/quick/items/qquickwindow.cpp
@@ -3223,7 +3223,7 @@ QOpenGLContext *QQuickWindow::openglContext() const
Q_D(const QQuickWindow);
if (d->context && d->context->isValid()) {
QSGRendererInterface *rif = d->context->sceneGraphContext()->rendererInterface(d->context);
- if (rif && rif->graphicsAPI() == QSGRendererInterface::OpenGL) {
+ if (rif && rif->graphicsApi() == QSGRendererInterface::OpenGL) {
auto openglRenderContext = static_cast<const QSGDefaultRenderContext *>(d->context);
return openglRenderContext->openglContext();
}
@@ -4453,7 +4453,7 @@ QSGRendererInterface *QQuickWindow::rendererInterface() const
\since 5.8
*/
-void QQuickWindow::setSceneGraphBackend(QSGRendererInterface::GraphicsAPI api)
+void QQuickWindow::setSceneGraphBackend(QSGRendererInterface::GraphicsApi api)
{
switch (api) {
case QSGRendererInterface::Software:
diff --git a/src/quick/items/qquickwindow.h b/src/quick/items/qquickwindow.h
index 37be6d591c..c741772253 100644
--- a/src/quick/items/qquickwindow.h
+++ b/src/quick/items/qquickwindow.h
@@ -156,7 +156,7 @@ public:
QSGRendererInterface *rendererInterface() const;
- static void setSceneGraphBackend(QSGRendererInterface::GraphicsAPI api);
+ static void setSceneGraphBackend(QSGRendererInterface::GraphicsApi api);
static void setSceneGraphBackend(const QString &backend);
Q_SIGNALS: