From 4dc7b34dfd6f64a899bd992f715ed9860251badc Mon Sep 17 00:00:00 2001 From: nbd Date: Tue, 2 Nov 2010 16:56:14 +0000 Subject: [PATCH] qt4: move the @DISPLAY_SUPPORT dependency to qt4-gui, however do not enable any qt4 package by default unless qt4-gui is also enabled git-svn-id: svn://svn.openwrt.org/openwrt/packages@23799 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- Xorg/lib/qt4/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Xorg/lib/qt4/Makefile b/Xorg/lib/qt4/Makefile index 18e95456b..6bff1d313 100644 --- a/Xorg/lib/qt4/Makefile +++ b/Xorg/lib/qt4/Makefile @@ -58,20 +58,22 @@ define Package/qt4/Default SUBMENU:=framework TITLE:=qt4 DEPENDS:=qt4 + DEFAULT:=m if PACKAGE_qt4-gui && ALL URL:=http://qt.nokia.com/ endef define Package/qt4 $(call Package/qt4/Default) - DEPENDS:=+zlib +libstdcpp +libsqlite3 @DISPLAY_SUPPORT + DEPENDS:=+zlib +libstdcpp +libsqlite3 endef define Package/qt4-gui $(call Package/qt4/Default) + DEFAULT:= DEPENDS+=+libpng +libtiff +libjpeg +libfreetype +qt4-network \ +FEATURE_drawing-backend_DirectFB:directfb \ +FEATURE_drawing-backend_libX11:libX11 \ - +FEATURE_drawing-backend_libX11:libXext + +FEATURE_drawing-backend_libX11:libXext @DISPLAY_SUPPORT TITLE+=(gui) endef -- 2.11.0