diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-18 12:12:58 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-18 12:12:58 +0100 |
| commit | e281537f2049af0b96fd87158f2b7212afe8ab5f (patch) | |
| tree | 7f9e3b14a2456cc779aa165457192094507dd257 /src/angle/patches/0020-ANGLE-Do-not-use-std-strlen.patch | |
| parent | e0a8b5ce88bc50440dcec2fe3a86d83e2a7dc7b0 (diff) | |
| parent | 84569773db68408704193268bc42a200bb25a924 (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/corelib/global/qglobal.h
src/platformsupport/platformcompositor/qopenglcompositor.cpp
src/platformsupport/platformcompositor/qopenglcompositorbackingstore.cpp
tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
Change-Id: I5422868500be695584a496dbbbc719d146bc572d
Diffstat (limited to 'src/angle/patches/0020-ANGLE-Do-not-use-std-strlen.patch')
| -rw-r--r-- | src/angle/patches/0020-ANGLE-Do-not-use-std-strlen.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/src/angle/patches/0020-ANGLE-Do-not-use-std-strlen.patch b/src/angle/patches/0020-ANGLE-Do-not-use-std-strlen.patch new file mode 100644 index 0000000000..324244f6eb --- /dev/null +++ b/src/angle/patches/0020-ANGLE-Do-not-use-std-strlen.patch @@ -0,0 +1,30 @@ +From 071b8936386b0b44475c91511d85479e5c633bc5 Mon Sep 17 00:00:00 2001 +From: Kai Koehne <kai.koehne@theqtcompany.com> +Date: Thu, 11 Dec 2014 13:54:23 +0100 +Subject: [PATCH] ANGLE: Do not use std::strlen + +This is a cherry-pick from upstream change + +e7cfb3dd2029c1bfe5c175ad994c03cac221ad4d + +Change-Id: Iefe01545319f9ad268c0c6bf8e8b2181e09d8a84 +--- + src/3rdparty/angle/src/libGLESv2/Shader.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/3rdparty/angle/src/libGLESv2/Shader.cpp b/src/3rdparty/angle/src/libGLESv2/Shader.cpp +index 5bca746..024ef8f 100644 +--- a/src/3rdparty/angle/src/libGLESv2/Shader.cpp ++++ b/src/3rdparty/angle/src/libGLESv2/Shader.cpp +@@ -53,7 +53,7 @@ void Shader::setSource(GLsizei count, const char *const *string, const GLint *le + { + if (length == nullptr || length[i] < 0) + { +- stream.write(string[i], std::strlen(string[i])); ++ stream.write(string[i], strlen(string[i])); + } + else + { +-- +1.9.4.msysgit.0 + |