summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase-git/0006-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2014-11-27 13:48:38 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2014-12-09 11:06:30 +0100
commit54c44443c34f077bfc2c5cc3a92d6db59d28343c (patch)
tree479cd0ba85d55e8d01ae1396bca7397880360b70 /recipes-qt/qt5/qtbase-git/0006-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch
parent5b8f470597d4f163952f3b63a8ee39a2ccabfe4c (diff)
downloadmeta-qt5-54c44443c34f077bfc2c5cc3a92d6db59d28343c.tar.gz
qt5-git: Update to rc1+, latest revision in 5.4 branch
* qtwebengine LIC_FILES_CHKSUM updated because of Copyright year update in chromium's LICENSE < // Copyright (c) 2013 The Chromium Authors. All rights reserved. and shortened the entry for qtwebengine LIC_FILES_CHKSUM, because it was including also few #include lines which were changed recently Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase-git/0006-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch')
-rw-r--r--recipes-qt/qt5/qtbase-git/0006-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/recipes-qt/qt5/qtbase-git/0006-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch b/recipes-qt/qt5/qtbase-git/0006-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch
index 6e47e815..042d7638 100644
--- a/recipes-qt/qt5/qtbase-git/0006-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch
+++ b/recipes-qt/qt5/qtbase-git/0006-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch
@@ -1,4 +1,4 @@
1From 4b6778e44b35d97bd08baded4e5d1f570693ae05 Mon Sep 17 00:00:00 2001 1From 4a067c162d08596e3ec89dcfb3ecdf197b1bf22a Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Mon, 21 Apr 2014 19:22:04 +0200 3Date: Mon, 21 Apr 2014 19:22:04 +0200
4Subject: [PATCH 06/11] Revert "eglfs: Print the chosen config in debug mode" 4Subject: [PATCH 06/11] Revert "eglfs: Print the chosen config in debug mode"
@@ -51,7 +51,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
51 2 files changed, 3 insertions(+), 8 deletions(-) 51 2 files changed, 3 insertions(+), 8 deletions(-)
52 52
53diff --git a/src/platformsupport/eglconvenience/qeglconvenience.cpp b/src/platformsupport/eglconvenience/qeglconvenience.cpp 53diff --git a/src/platformsupport/eglconvenience/qeglconvenience.cpp b/src/platformsupport/eglconvenience/qeglconvenience.cpp
54index 1fdeec3..0fa3d88 100644 54index c1a491c..7a0fc87 100644
55--- a/src/platformsupport/eglconvenience/qeglconvenience.cpp 55--- a/src/platformsupport/eglconvenience/qeglconvenience.cpp
56+++ b/src/platformsupport/eglconvenience/qeglconvenience.cpp 56+++ b/src/platformsupport/eglconvenience/qeglconvenience.cpp
57@@ -443,9 +443,11 @@ void q_printEglConfig(EGLDisplay display, EGLConfig config) 57@@ -443,9 +443,11 @@ void q_printEglConfig(EGLDisplay display, EGLConfig config)
@@ -66,7 +66,7 @@ index 1fdeec3..0fa3d88 100644
66+ qWarning("\n"); 66+ qWarning("\n");
67 } 67 }
68 68
69 #ifdef Q_OS_LINUX 69 #ifdef Q_OS_UNIX
70diff --git a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp 70diff --git a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp
71index 7cc3300..ccbd974 100644 71index 7cc3300..ccbd974 100644
72--- a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp 72--- a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp
@@ -93,5 +93,5 @@ index 7cc3300..ccbd974 100644
93 } 93 }
94 94
95-- 95--
962.1.1 962.1.3
97 97