diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2020-05-02 17:04:10 -0700 |
---|---|---|
committer | Thiago Macieira <thiago.macieira@intel.com> | 2020-05-07 02:15:37 +0000 |
commit | 4cf1769a6b5820f0fb3131ce25af240ee3ff70ae (patch) | |
tree | a51da8290156f6c185c96a6bf63721c8da1e382f /src/hardwareintegration/compositor/vulkan-server/vulkanserverbufferintegration.cpp | |
parent | 28e7d940c42c47cf039522709883ae3de9f4fb88 (diff) |
Fix warning about deprecated non-namespaced "hex"
waylandeglstreamintegration.cpp:248:121: warning: 'hex' is deprecated: Use Qt::hex [-Wdeprecated-declarations]
Change-Id: I99ab0f318b1c43b89888fffd160b5b6abebe48f2
(effective cherry-pick of 671f73bb1f26cf1d8daa1d33f01fc15fd1e9f62e)
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/hardwareintegration/compositor/vulkan-server/vulkanserverbufferintegration.cpp')
-rw-r--r-- | src/hardwareintegration/compositor/vulkan-server/vulkanserverbufferintegration.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/hardwareintegration/compositor/vulkan-server/vulkanserverbufferintegration.cpp b/src/hardwareintegration/compositor/vulkan-server/vulkanserverbufferintegration.cpp index 602e25f73..69af5f9f2 100644 --- a/src/hardwareintegration/compositor/vulkan-server/vulkanserverbufferintegration.cpp +++ b/src/hardwareintegration/compositor/vulkan-server/vulkanserverbufferintegration.cpp @@ -205,7 +205,7 @@ QOpenGLTexture *VulkanServerBuffer::toOpenGlTexture() return nullptr; funcs->glCreateMemoryObjectsEXT(1, &m_memoryObject); - if (extraDebug) qDebug() << "glCreateMemoryObjectsEXT" << hex << glGetError(); + if (extraDebug) qDebug() << "glCreateMemoryObjectsEXT" << Qt::hex << glGetError(); int dupfd = fcntl(m_fd, F_DUPFD_CLOEXEC, 0); @@ -215,7 +215,7 @@ QOpenGLTexture *VulkanServerBuffer::toOpenGlTexture() } funcs->glImportMemoryFdEXT(m_memoryObject, m_memorySize, GL_HANDLE_TYPE_OPAQUE_FD_EXT, dupfd); - if (extraDebug) qDebug() << "glImportMemoryFdEXT" << hex << glGetError(); + if (extraDebug) qDebug() << "glImportMemoryFdEXT" << Qt::hex << glGetError(); if (!m_texture) @@ -223,13 +223,13 @@ QOpenGLTexture *VulkanServerBuffer::toOpenGlTexture() m_texture->create(); GLuint texId = m_texture->textureId(); - if (extraDebug) qDebug() << "created texture" << texId << hex << glGetError(); + if (extraDebug) qDebug() << "created texture" << texId << Qt::hex << glGetError(); m_texture->bind(); - if (extraDebug) qDebug() << "bound texture" << texId << hex << glGetError(); + if (extraDebug) qDebug() << "bound texture" << texId << Qt::hex << glGetError(); funcs->glTexStorageMem2DEXT(GL_TEXTURE_2D, 1, m_glInternalFormat, m_size.width(), m_size.height(), m_memoryObject, 0 ); - if (extraDebug) qDebug() << "glTexStorageMem2DEXT" << hex << glGetError(); - if (extraDebug) qDebug() << "format" << hex << m_glInternalFormat << GL_RGBA8; + if (extraDebug) qDebug() << "glTexStorageMem2DEXT" << Qt::hex << glGetError(); + if (extraDebug) qDebug() << "format" << Qt::hex << m_glInternalFormat << GL_RGBA8; return m_texture; |