|
| 1 | +From cd14b80dd87ff9ae632bf0479a1d824c72316362 Mon Sep 17 00:00:00 2001 |
| 2 | +From: Laszlo Agocs <laszlo.agocs@digia.com> |
| 3 | +Date: Wed, 12 Mar 2014 16:56:19 +0100 |
| 4 | +Subject: [PATCH] Fix no-opengl build with egl |
| 5 | +MIME-Version: 1.0 |
| 6 | +Content-Type: text/plain; charset=UTF-8 |
| 7 | +Content-Transfer-Encoding: 8bit |
| 8 | + |
| 9 | +Disable eglfs and similar plugins when opengl is not enabled. |
| 10 | +(but egl is present) |
| 11 | + |
| 12 | +GL-dependent parts of eglconvenience need to be skipped too. |
| 13 | + |
| 14 | +Task-number: QTBUG-37457 |
| 15 | +Change-Id: I44d49495241551bc7b1f565aa0b5ace9f310628e |
| 16 | +Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> |
| 17 | +Reviewed-by: Jørgen Lind <jorgen.lind@digia.com> |
| 18 | +Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com> |
| 19 | + |
| 20 | +Conflicts: |
| 21 | + src/platformsupport/eglconvenience/eglconvenience.pri |
| 22 | +--- |
| 23 | + configure | 2 +- |
| 24 | + src/platformsupport/eglconvenience/eglconvenience.pri | 7 +++++-- |
| 25 | + 2 files changed, 6 insertions(+), 3 deletions(-) |
| 26 | + |
| 27 | +diff --git a/configure b/configure |
| 28 | +index aaa59bd..0c310ff 100755 |
| 29 | +--- a/configure |
| 30 | ++++ b/configure |
| 31 | +@@ -5337,7 +5337,7 @@ if [ "$CFG_EGL" != "no" ]; then |
| 32 | + fi |
| 33 | + |
| 34 | + if [ "$CFG_EGLFS" != "no" ]; then |
| 35 | +- if [ "$XPLATFORM_QNX" = "no" ]; then |
| 36 | ++ if [ "$XPLATFORM_QNX" = "no" ] && [ "$CFG_OPENGL" != "no" ]; then |
| 37 | + CFG_EGLFS="$CFG_EGL" |
| 38 | + else |
| 39 | + CFG_EGLFS="no" |
| 40 | +diff --git a/src/platformsupport/eglconvenience/eglconvenience.pri b/src/platformsupport/eglconvenience/eglconvenience.pri |
| 41 | +index 506f4ab..462c60c 100644 |
| 42 | +--- a/src/platformsupport/eglconvenience/eglconvenience.pri |
| 43 | ++++ b/src/platformsupport/eglconvenience/eglconvenience.pri |
| 44 | +@@ -1,13 +1,16 @@ |
| 45 | + contains(QT_CONFIG,egl) { |
| 46 | + HEADERS += \ |
| 47 | + $$PWD/qeglconvenience_p.h \ |
| 48 | +- $$PWD/qeglplatformcontext_p.h \ |
| 49 | + $$PWD/qeglpbuffer_p.h |
| 50 | + SOURCES += \ |
| 51 | + $$PWD/qeglconvenience.cpp \ |
| 52 | +- $$PWD/qeglplatformcontext.cpp \ |
| 53 | + $$PWD/qeglpbuffer.cpp |
| 54 | + |
| 55 | ++ contains(QT_CONFIG,opengl) { |
| 56 | ++ HEADERS += $$PWD/qeglplatformcontext_p.h |
| 57 | ++ SOURCES += $$PWD/qeglplatformcontext.cpp |
| 58 | ++ } |
| 59 | ++ |
| 60 | + contains(QT_CONFIG,xlib) { |
| 61 | + HEADERS += \ |
| 62 | + $$PWD/qxlibeglintegration_p.h |
| 63 | +-- |
| 64 | +1.9.1 |
| 65 | + |
0 commit comments