summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@qt.io>2020-10-07 12:21:04 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2020-10-12 04:35:14 +0000
commit8890e05c45575f43e2fef5ac09efee3d05a34a60 (patch)
tree39e4a9ca53c28024f32799863a296914062cac87
parent2cb631894332eff4604cbb031d77a4fedd461148 (diff)
Adapt to platform API rename
Fixes: QTBUG-87313 Change-Id: I99c0b08d908cffe271b555e0696af5fba3fb8780 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
-rw-r--r--src/compositor/compositor_api/qwaylandquickitem.cpp4
-rw-r--r--src/hardwareintegration/compositor/hardwarelayer/vsp2/vsp2hardwarelayerintegration.cpp2
-rw-r--r--src/hardwareintegration/compositor/hardwarelayer/vsp2/vsp2hardwarelayerintegration.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/compositor/compositor_api/qwaylandquickitem.cpp b/src/compositor/compositor_api/qwaylandquickitem.cpp
index 9aded1c93..891823c6b 100644
--- a/src/compositor/compositor_api/qwaylandquickitem.cpp
+++ b/src/compositor/compositor_api/qwaylandquickitem.cpp
@@ -312,7 +312,7 @@ public:
auto texture = buffer.toOpenGLTexture();
GLuint textureId = texture->textureId();
auto size = surface->bufferSize();
- m_sgTex = QPlatformInterface::QSGOpenGLTexture::fromNative(textureId, surfaceItem->window(), size, opt);
+ m_sgTex = QNativeInterface::QSGOpenGLTexture::fromNative(textureId, surfaceItem->window(), size, opt);
#else
qCWarning(qLcWaylandCompositor) << "Without OpenGL support only shared memory textures are supported";
#endif
@@ -1394,7 +1394,7 @@ QSGNode *QWaylandQuickItem::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeDat
QWaylandQuickSurface *waylandSurface = qobject_cast<QWaylandQuickSurface *>(surface());
if (waylandSurface != nullptr && waylandSurface->useTextureAlpha())
opt |= QQuickWindow::TextureHasAlphaChannel;
- QSGTexture *scenegraphTexture = QPlatformInterface::QSGOpenGLTexture::fromNative(texture->textureId(),
+ QSGTexture *scenegraphTexture = QNativeInterface::QSGOpenGLTexture::fromNative(texture->textureId(),
window(),
ref.size(),
opt);
diff --git a/src/hardwareintegration/compositor/hardwarelayer/vsp2/vsp2hardwarelayerintegration.cpp b/src/hardwareintegration/compositor/hardwarelayer/vsp2/vsp2hardwarelayerintegration.cpp
index ad25d88ff..e527e1a07 100644
--- a/src/hardwareintegration/compositor/hardwarelayer/vsp2/vsp2hardwarelayerintegration.cpp
+++ b/src/hardwareintegration/compositor/hardwarelayer/vsp2/vsp2hardwarelayerintegration.cpp
@@ -43,7 +43,7 @@ extern "C" {
#include <qpa/qlatformscreen_p.h>
-using namespace QPlatformInterface::Private;
+using namespace QNativeInterface::Private;
QT_BEGIN_NAMESPACE
diff --git a/src/hardwareintegration/compositor/hardwarelayer/vsp2/vsp2hardwarelayerintegration.h b/src/hardwareintegration/compositor/hardwarelayer/vsp2/vsp2hardwarelayerintegration.h
index f72bbc3e3..982c96cba 100644
--- a/src/hardwareintegration/compositor/hardwarelayer/vsp2/vsp2hardwarelayerintegration.h
+++ b/src/hardwareintegration/compositor/hardwarelayer/vsp2/vsp2hardwarelayerintegration.h
@@ -40,7 +40,7 @@ struct wl_kms_buffer;
QT_BEGIN_NAMESPACE
-namespace QPlatformInterface::Private {
+namespace QNativeInterface::Private {
struct QVsp2Screen;
}