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
This commit is contained in:
parent
46235e5973
commit
4dc7b34dfd
@ -58,20 +58,22 @@ define Package/qt4/Default
|
|||||||
SUBMENU:=framework
|
SUBMENU:=framework
|
||||||
TITLE:=qt4
|
TITLE:=qt4
|
||||||
DEPENDS:=qt4
|
DEPENDS:=qt4
|
||||||
|
DEFAULT:=m if PACKAGE_qt4-gui && ALL
|
||||||
URL:=http://qt.nokia.com/
|
URL:=http://qt.nokia.com/
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/qt4
|
define Package/qt4
|
||||||
$(call Package/qt4/Default)
|
$(call Package/qt4/Default)
|
||||||
DEPENDS:=+zlib +libstdcpp +libsqlite3 @DISPLAY_SUPPORT
|
DEPENDS:=+zlib +libstdcpp +libsqlite3
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/qt4-gui
|
define Package/qt4-gui
|
||||||
$(call Package/qt4/Default)
|
$(call Package/qt4/Default)
|
||||||
|
DEFAULT:=
|
||||||
DEPENDS+=+libpng +libtiff +libjpeg +libfreetype +qt4-network \
|
DEPENDS+=+libpng +libtiff +libjpeg +libfreetype +qt4-network \
|
||||||
+FEATURE_drawing-backend_DirectFB:directfb \
|
+FEATURE_drawing-backend_DirectFB:directfb \
|
||||||
+FEATURE_drawing-backend_libX11:libX11 \
|
+FEATURE_drawing-backend_libX11:libX11 \
|
||||||
+FEATURE_drawing-backend_libX11:libXext
|
+FEATURE_drawing-backend_libX11:libXext @DISPLAY_SUPPORT
|
||||||
TITLE+=(gui)
|
TITLE+=(gui)
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user