qt4: move the @DISPLAY_SUPPORT dependency to qt4-gui, however do not enable any qt4...

[openwrt/svn-archive/archive.git] / Xorg / lib / qt4 / Makefile

diff --git a/Xorg/lib/qt4/Makefile b/Xorg/lib/qt4/Makefile
index 18e95456b9c59787ac5c3dc017eeacd94947bb4b..6bff1d313759934834353651c1779fb689fafd56 100644 (file)
--- 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