bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qt4: Fix non-GUI build

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@22822 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
mb 2010-08-27 16:12:57 +00:00
parent d6434b1c39
commit 14bf835bfb
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Xorg/lib/qt4/Config.in
View File

@ -1,6 +1,6 @@
choice choice
prompt "qt4 window system" prompt "qt4 window system"
depends on PACKAGE_qt4 depends on PACKAGE_qt4 && PACKAGE_qt4-gui
default QT4_WS_QWS default QT4_WS_QWS
config QT4_WS_QWS config QT4_WS_QWS

8
Xorg/lib/qt4/Makefile
View File

@ -258,6 +258,11 @@ endif
ifeq ($(CONFIG_QT4_WS_X11),y) ifeq ($(CONFIG_QT4_WS_X11),y)
FILEPFX:=x11- FILEPFX:=x11-
endif 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 define Build/Configure
# NOTES: # NOTES:
@ -300,8 +305,7 @@ define Build/Configure
-nomake translations \ -nomake translations \
-xplatform $(QMAKE_PLATFORM_PREFIX)linux-openwrt-g++ \ -xplatform $(QMAKE_PLATFORM_PREFIX)linux-openwrt-g++ \
-platform linux-g++ \ -platform linux-g++ \
$(if $(CONFIG_QT4_WS_QWS),-embedded) \ $(if $(CONFIG_QT4_WS_X11),-x11,-embedded) \
$(if $(CONFIG_QT4_WS_X11),-x11) \
-release \ -release \
-confirm-license \ -confirm-license \
-opensource \ -opensource \