1 files changed, 9 insertions, 6 deletions

diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
index 47b0a1434..b84e3d49e 100644
--- a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
+++ b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
@@ -1,17 +1,20 @@
 # Copyright (C) 2013 Eric Bénard - Eukréa Electromatique
 # Copyright (C) 2016 Freescale Semiconductor
 # Copyright (C) 2016, 2017 O.S. Systems Software LTDA.
-# Copyright (C) 2017 NXP
+# Copyright (C) 2017-2018 NXP
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-SRC_URI_append_imxgpu2d = "file://0014-Add-IMX-GPU-support.patch \
-                           file://0001-egl.prf-Fix-build-error-when-egl-headers-need-platfo.patch \
+SRC_URI_append_imxgpu2d = " \
+    file://0014-Add-IMX-GPU-support.patch \
+    file://0001-egl.prf-Fix-build-error-when-egl-headers-need-platfo.patch \
+"
+SRC_URI_APPEND_3D_NOT_X11 = " \
+    file://0015-Add-eglfs-to-IMX-GPU.patch \
+    file://0016-Configure-eglfs-with-egl-pkg-config.patch \
 "
 SRC_URI_append_imxgpu3d = " \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', \
-                                                   'file://0015-Add-eglfs-to-IMX-GPU.patch \
-                                                    file://0016-Configure-eglfs-with-egl-pkg-config.patch', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '${SRC_URI_APPEND_3D_NOT_X11}', d)} \
 "
 
 PACKAGECONFIG_GL_imxpxp   = "gles2"