38 lines
1.1 KiB
Diff
38 lines
1.1 KiB
Diff
|
From c11299086b7718332e2b4fbc37ce6f6ff427c5ba Mon Sep 17 00:00:00 2001
|
||
|
|
From: Yuqing Zhu <carol.zhu@nxp.com>
|
||
|
|
Date: Mon, 27 Mar 2017 15:33:35 +0800
|
||
|
|
Subject: [PATCH] qtbase: Fix build error when using EGL
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=utf-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
A build error was occurring due to missing EGL configuration.
|
||
|
|
|
||
|
|
Fixed by adding the necessary ties to the EGL pkg-config.
|
||
|
|
|
||
|
|
Task-number: QTBUG-61712
|
||
|
|
Change-Id: I87190ea39392b4604c563cf9d89edb85068d85fc
|
||
|
|
Upstream-Status: Pending
|
||
|
|
Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com>
|
||
|
|
---
|
||
|
|
mkspecs/features/egl.prf | 6 ++++++
|
||
|
|
1 file changed, 6 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/mkspecs/features/egl.prf b/mkspecs/features/egl.prf
|
||
|
|
index 9fa0c9e219..85d5852ba6 100644
|
||
|
|
--- a/mkspecs/features/egl.prf
|
||
|
|
+++ b/mkspecs/features/egl.prf
|
||
|
|
@@ -1,3 +1,9 @@
|
||
|
|
+# egl headers need a definition
|
||
|
|
+PKG_CONFIG = $$pkgConfigExecutable()
|
||
|
|
+PKGCONFIG_CFLAGS = $$system($$PKG_CONFIG --cflags egl)
|
||
|
|
+PKGCONFIG_CFLAGS = $$find(PKGCONFIG_CFLAGS, ^-D.*)
|
||
|
|
+QMAKE_CFLAGS_EGL = $$PKGCONFIG_CFLAGS
|
||
|
|
+
|
||
|
|
INCLUDEPATH += $$QMAKE_INCDIR_EGL
|
||
|
|
LIBS_PRIVATE += $$QMAKE_LIBS_EGL
|
||
|
|
QMAKE_CFLAGS += $$QMAKE_CFLAGS_EGL
|
||
|
|
--
|
||
|
|
2.16.1
|
||
|
|
|