Mercurial > mxe-octave

diff src/qtbase.mk @ 5115:0043dcde564a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* src/qtbase.mk: dont use inbuilt qt xcb if providing own xlibs
author John Donoghue
date Fri, 05 Jul 2019 13:58:08 -0400
parents 9d35f8eb1e76
children f0fb4aebfcd0
line wrap: on
line diff
--- a/src/qtbase.mk	Fri Jul 05 09:46:53 2019 -0400
+++ b/src/qtbase.mk	Fri Jul 05 13:58:08 2019 -0400
@@ -62,7 +62,11 @@
 ifeq ($(USE_SYSTEM_OPENGL),no)
   $(PKG)_CONFIGURE_OPTS += -qpa xcb -xcb
 else
-  $(PKG)_CONFIGURE_OPTS += -qpa xcb -qt-xcb
+  ifeq ($(USE_SYSTEM_X11_LIBS),no)
+    $(PKG)_CONFIGURE_OPTS += -qpa xcb -xcb
+  else
+    $(PKG)_CONFIGURE_OPTS += -qpa xcb -qt-xcb
+  endif
 endif
 endif