[qt4] reorganize conditional drawing-backend dependencies
authorMirko Vogt <mirko@openwrt.org>
Wed, 25 Aug 2010 11:00:44 +0000 (11:00 +0000)
committerMirko Vogt <mirko@openwrt.org>
Wed, 25 Aug 2010 11:00:44 +0000 (11:00 +0000)
SVN-Revision: 22793

Xorg/lib/qt4/Config.in
Xorg/lib/qt4/Makefile

index 87555ac10a8c4e9e518504f45d39e41afdb59be6..903850a9a431473f3aa4d1424c151b71359277f4 100644 (file)
@@ -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
 
index 956164801fdd80e029a42be7e8e4bf77ca52de62..160975f3b92c2e89d0eeb816af29b8cde677bd37 100644 (file)
@@ -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