summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/ogl-runtime
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2019-08-16 09:15:31 +0300
committerSamuli Piippo <samuli.piippo@qt.io>2019-08-16 10:35:31 +0300
commitb9313110bd4ec9a30a037f2edd78b02bf57ed6eb (patch)
treeeaf467a73585a6a4971d87324897bc21d771c5ab /recipes-qt/qt5/ogl-runtime
parent0fb09cabc2499f52113630dacbea7524402e7793 (diff)
parentf6bae656fa1b8e7ec28ecac5bf0ac70d63abd1b5 (diff)
downloadmeta-qt5-b9313110bd4ec9a30a037f2edd78b02bf57ed6eb.tar.gz
Merge remote-tracking branch 'origin/5.13' into dev
* origin/5.13: (22 commits) qt5-creator: fix bad merge qtbase: use offscreen platform plugin for tools coin: update poky and openembedded revisions qtwebengine: allow build for musl libc qt5: update submodules qt5: update to Qt 5.12.5 Add CI build instructions qt5-creator: fix build with musl ogl-runtime: fix build on musl libc qtdeclarative: Use qmlcachegen provided by OE instead of system one. qtbase-native: Always use qt provided doubleconversion library. qttools: Enable clang support when using clang qt5-creator: update to v4.9.2 maliit-framework-qt5: Fix build when ptest is enabled qtwebengine: Fix build on aarch64 qtwebengine: refresh the patches to apply qtremoteobjects: Use OE_PATH_EXTERNAL_HOST_BINS to enable cmake to find repc qt5: Upgrade to Qt 5.13.0 Allow enabling gui for native and nativesdk qt5everywheredemo: update HOMEPAGE ... Change-Id: I59c8da38833c99e3f8f24f09d04a48c9df79bbf5
Diffstat (limited to 'recipes-qt/qt5/ogl-runtime')
-rw-r--r--recipes-qt/qt5/ogl-runtime/0002-Fix-format-security-issues.patch75
1 files changed, 0 insertions, 75 deletions
diff --git a/recipes-qt/qt5/ogl-runtime/0002-Fix-format-security-issues.patch b/recipes-qt/qt5/ogl-runtime/0002-Fix-format-security-issues.patch
deleted file mode 100644
index fcf6915d..00000000
--- a/recipes-qt/qt5/ogl-runtime/0002-Fix-format-security-issues.patch
+++ /dev/null
@@ -1,75 +0,0 @@
1From c80b588cc3e11a80ffedd778fab3f19c686552f7 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Mon, 5 Aug 2019 14:24:44 +0300
4Subject: [PATCH] Fix format-security issues
5
6format not a string literal and no format arguments [-Wformat-security]
7
8Change-Id: I04c1d1598948b664b9d85036030c6f89fcf3c8b7
9---
10 src/render/backends/gl/Q3DSRenderBackendGLES2.cpp | 4 ++--
11 src/render/backends/gl/Qt3DSRenderBackendGLBase.cpp | 8 ++++----
12 2 files changed, 6 insertions(+), 6 deletions(-)
13
14diff --git a/src/render/backends/gl/Q3DSRenderBackendGLES2.cpp b/src/render/backends/gl/Q3DSRenderBackendGLES2.cpp
15index ac5b992..02046ac 100644
16--- a/src/render/backends/gl/Q3DSRenderBackendGLES2.cpp
17+++ b/src/render/backends/gl/Q3DSRenderBackendGLES2.cpp
18@@ -663,7 +663,7 @@ NVRenderBackendGLES2Impl::CreateRenderbuffer(NVRenderRenderBufferFormats::Enum s
19 // check for error
20 GLenum error = m_glFunctions->glGetError();
21 if (error != GL_NO_ERROR) {
22- qCCritical(GL_ERROR, GLConversion::processGLError(error));
23+ qCCritical(GL_ERROR) << GLConversion::processGLError(error);
24 QT3DS_ASSERT(false);
25 GL_CALL_EXTRA_FUNCTION(glDeleteRenderbuffers(1, &bufID));
26 bufID = 0;
27@@ -699,7 +699,7 @@ bool NVRenderBackendGLES2Impl::ResizeRenderbuffer(NVRenderBackendRenderbufferObj
28 // check for error
29 GLenum error = m_glFunctions->glGetError();
30 if (error != GL_NO_ERROR) {
31- qCCritical(GL_ERROR, GLConversion::processGLError(error));
32+ qCCritical(GL_ERROR) << GLConversion::processGLError(error);
33 QT3DS_ASSERT(false);
34 success = false;
35 }
36diff --git a/src/render/backends/gl/Qt3DSRenderBackendGLBase.cpp b/src/render/backends/gl/Qt3DSRenderBackendGLBase.cpp
37index 0fe6e0f..5dfe9d1 100644
38--- a/src/render/backends/gl/Qt3DSRenderBackendGLBase.cpp
39+++ b/src/render/backends/gl/Qt3DSRenderBackendGLBase.cpp
40@@ -604,7 +604,7 @@ NVRenderBackendGLBase::CreateBuffer(size_t size, NVRenderBufferBindFlags bindFla
41 } else {
42 GL_CALL_FUNCTION(glDeleteBuffers(1, &bufID));
43 bufID = 0;
44- qCCritical(GL_ERROR, GLConversion::processGLError(target));
45+ qCCritical(GL_ERROR) << GLConversion::processGLError(target);
46 }
47 }
48
49@@ -832,7 +832,7 @@ NVRenderBackendGLBase::CreateRenderbuffer(NVRenderRenderBufferFormats::Enum stor
50 // check for error
51 GLenum error = m_glFunctions->glGetError();
52 if (error != GL_NO_ERROR) {
53- qCCritical(GL_ERROR, GLConversion::processGLError(error));
54+ qCCritical(GL_ERROR) << GLConversion::processGLError(error);
55 QT3DS_ASSERT(false);
56 GL_CALL_FUNCTION(glDeleteRenderbuffers(1, &bufID));
57 bufID = 0;
58@@ -869,7 +869,7 @@ bool NVRenderBackendGLBase::ResizeRenderbuffer(NVRenderBackendRenderbufferObject
59 // check for error
60 GLenum error = m_glFunctions->glGetError();
61 if (error != GL_NO_ERROR) {
62- qCCritical(GL_ERROR, GLConversion::processGLError(error));
63+ qCCritical(GL_ERROR) << GLConversion::processGLError(error);
64 QT3DS_ASSERT(false);
65 success = false;
66 }
67@@ -1306,7 +1306,7 @@ bool NVRenderBackendGLBase::compileSource(GLuint shaderID, NVConstDataRef<QT3DSI
68 GLenum binaryError = m_glFunctions->glGetError();
69 if (binaryError != GL_NO_ERROR) {
70 shaderStatus = GL_FALSE;
71- qCCritical(GL_ERROR, GLConversion::processGLError(binaryError));
72+ qCCritical(GL_ERROR) << GLConversion::processGLError(binaryError);
73 }
74 }
75