From 00ba73737ca9d27cfa086e6dd7e4c9f65e6c33cf Mon Sep 17 00:00:00 2001 From: Mirko Vogt Date: Wed, 25 Aug 2010 11:00:44 +0000 Subject: [PATCH] [qt4] reorganize conditional drawing-backend dependencies SVN-Revision: 22793 --- Xorg/lib/qt4/Config.in | 2 -- Xorg/lib/qt4/Makefile | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Xorg/lib/qt4/Config.in b/Xorg/lib/qt4/Config.in index 87555ac10a..903850a9a4 100644 --- a/Xorg/lib/qt4/Config.in +++ b/Xorg/lib/qt4/Config.in @@ -6,14 +6,12 @@ choice config QT4_WS_QWS bool "QWS window system" depends on FEATURE_drawing-backend_DirectFB - select PACKAGE_directfb help Use QT4's internal QWS window system. config QT4_WS_X11 bool "X11 window system" depends on FEATURE_drawing-backend_libX11 - select PACKAGE_libX11 help Use X11 diff --git a/Xorg/lib/qt4/Makefile b/Xorg/lib/qt4/Makefile index 956164801f..160975f3b9 100644 --- a/Xorg/lib/qt4/Makefile +++ b/Xorg/lib/qt4/Makefile @@ -62,12 +62,12 @@ endef define Package/qt4 $(call Package/qt4/Default) - DEPENDS:=@FEATURE_drawing-backend_DirectFB||@FEATURE_drawing-backend_libX11 +zlib +libstdcpp +libsqlite3 + DEPENDS:=+zlib +libstdcpp +libsqlite3 endef define Package/qt4-gui $(call Package/qt4/Default) - DEPENDS+=+libpng +libtiff +libjpeg +libfreetype +qt4-network + DEPENDS+=+libpng +libtiff +libjpeg +libfreetype +qt4-network +FEATURE_drawing-backend_DirectFB:directfb +FEATURE_drawing-backend_libX11:libX11 TITLE+=(gui) endef -- 2.30.2