diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2014-06-04 17:12:58 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-06-10 12:11:52 +0200 |
commit | b4e270f9e2e5c632f0958af1a5131efb45bcd799 (patch) | |
tree | 9c0fe3a4f0fda7c9de63b55e8d8549c55d166410 /recipes-qt/qt5/qtbase-git/0005-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch | |
parent | 06c25e6a6b9ff6f36f91412b2f8e10e8cd39bf3b (diff) | |
download | meta-qt5-b4e270f9e2e5c632f0958af1a5131efb45bcd799.tar.gz |
qtbase: Refresh patches to match with stable* branches on github.com/meta-qt5
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase-git/0005-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase-git/0005-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch | 56 |
1 files changed, 0 insertions, 56 deletions
diff --git a/recipes-qt/qt5/qtbase-git/0005-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch b/recipes-qt/qt5/qtbase-git/0005-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch deleted file mode 100644 index 213a9c34..00000000 --- a/recipes-qt/qt5/qtbase-git/0005-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch +++ /dev/null | |||
@@ -1,56 +0,0 @@ | |||
1 | From 22775e5f0b1097964062fbcf1805a841f971de34 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Mon, 21 Apr 2014 19:22:04 +0200 | ||
4 | Subject: [PATCH 5/8] Revert "eglfs: Print the chosen config in debug mode" | ||
5 | |||
6 | This reverts commit dc685cf6331f5fb46285cf10d6464c2ecf41f73e. | ||
7 | --- | ||
8 | src/platformsupport/eglconvenience/qeglconvenience.cpp | 4 +++- | ||
9 | src/platformsupport/eglconvenience/qeglplatformcontext.cpp | 7 ------- | ||
10 | 2 files changed, 3 insertions(+), 8 deletions(-) | ||
11 | |||
12 | diff --git a/src/platformsupport/eglconvenience/qeglconvenience.cpp b/src/platformsupport/eglconvenience/qeglconvenience.cpp | ||
13 | index 5eed470..39c7c1f 100644 | ||
14 | --- a/src/platformsupport/eglconvenience/qeglconvenience.cpp | ||
15 | +++ b/src/platformsupport/eglconvenience/qeglconvenience.cpp | ||
16 | @@ -451,9 +451,11 @@ void q_printEglConfig(EGLDisplay display, EGLConfig config) | ||
17 | for (index = 0; attrs[index].attr != -1; ++index) { | ||
18 | EGLint value; | ||
19 | if (eglGetConfigAttrib(display, config, attrs[index].attr, &value)) { | ||
20 | - qDebug("\t%s: %d", attrs[index].name, (int)value); | ||
21 | + qWarning("\t%s: %d\n", attrs[index].name, (int)value); | ||
22 | } | ||
23 | } | ||
24 | + | ||
25 | + qWarning("\n"); | ||
26 | } | ||
27 | |||
28 | #ifdef Q_OS_LINUX | ||
29 | diff --git a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp | ||
30 | index eec6463..4a7c69b 100644 | ||
31 | --- a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp | ||
32 | +++ b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp | ||
33 | @@ -44,7 +44,6 @@ | ||
34 | #include "qeglpbuffer_p.h" | ||
35 | #include <qpa/qplatformwindow.h> | ||
36 | #include <QOpenGLContext> | ||
37 | -#include <QDebug> | ||
38 | |||
39 | QT_BEGIN_NAMESPACE | ||
40 | |||
41 | @@ -192,12 +191,6 @@ void QEGLPlatformContext::init(const QSurfaceFormat &format, QPlatformOpenGLCont | ||
42 | return; | ||
43 | } | ||
44 | |||
45 | - static const bool printConfig = qgetenv("QT_QPA_EGLFS_DEBUG").toInt(); | ||
46 | - if (printConfig) { | ||
47 | - qDebug() << "Created context for format" << format << "with config:"; | ||
48 | - q_printEglConfig(m_eglDisplay, m_eglConfig); | ||
49 | - } | ||
50 | - | ||
51 | #ifndef QT_NO_OPENGL | ||
52 | // Make the context current to ensure the GL version query works. This needs a surface too. | ||
53 | const EGLint pbufferAttributes[] = { | ||
54 | -- | ||
55 | 2.0.0 | ||
56 | |||