From 14bf835bfb046da84ef3aaabc36cd56610952169 Mon Sep 17 00:00:00 2001
From: mb <mb@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 27 Aug 2010 16:12:57 +0000
Subject: [PATCH] qt4: Fix non-GUI build

git-svn-id: svn://svn.openwrt.org/openwrt/packages@22822 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 Xorg/lib/qt4/Config.in | 2 +-
 Xorg/lib/qt4/Makefile  | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Xorg/lib/qt4/Config.in b/Xorg/lib/qt4/Config.in
index 903850a9a..bf3fbbfce 100644
--- a/Xorg/lib/qt4/Config.in
+++ b/Xorg/lib/qt4/Config.in
@@ -1,6 +1,6 @@
 choice
 	prompt "qt4 window system"
-	depends on PACKAGE_qt4
+	depends on PACKAGE_qt4 && PACKAGE_qt4-gui
 	default QT4_WS_QWS
 
 config QT4_WS_QWS
diff --git a/Xorg/lib/qt4/Makefile b/Xorg/lib/qt4/Makefile
index 160975f3b..847034af1 100644
--- a/Xorg/lib/qt4/Makefile
+++ b/Xorg/lib/qt4/Makefile
@@ -258,6 +258,11 @@ endif
 ifeq ($(CONFIG_QT4_WS_X11),y)
   FILEPFX:=x11-
 endif
+ifeq ($(CONFIG_PACKAGE_qt4-gui),)
+  # If GUI is disabled, we use the X11 prefix. That's good enough, for now.
+  # The X11 files also work for non-GUI.
+  FILEPFX:=x11-
+endif
 
 define Build/Configure
 	# NOTES:
@@ -300,8 +305,7 @@ define Build/Configure
 			-nomake translations \
 			-xplatform $(QMAKE_PLATFORM_PREFIX)linux-openwrt-g++ \
 			-platform linux-g++ \
-			$(if $(CONFIG_QT4_WS_QWS),-embedded) \
-			$(if $(CONFIG_QT4_WS_X11),-x11) \
+			$(if $(CONFIG_QT4_WS_X11),-x11,-embedded) \
 			-release \
 			-confirm-license \
 			-opensource \
-- 
2.11.0