Merge remote-tracking branch 'x/master'

* x/master:
  qt-{designer,qtconfig}: do not depend in unexistent qt-plugin-gstreamer pkg.
This commit is contained in:
davehome 2011-11-09 01:38:28 -07:00
commit 4497383a50
2 changed files with 3 additions and 4 deletions

View file

@ -6,7 +6,7 @@ long_desc="${long_desc}
Qt Designer is a tool for designing and building graphical user
interfaces (GUIs) from Qt components."
revision=1
revision=2
gtk_iconcache_dirs="/usr/share/icons/hicolor"
@ -15,8 +15,6 @@ Add_dependency run glibc
Add_dependency run libstdc++
Add_dependency run libGL
Add_dependency run hicolor-icon-theme
Add_dependency run qt-plugin-gstreamer
Add_dependency run gst-plugins-good
Add_dependency run qt
do_install()

View file

@ -6,6 +6,8 @@ long_desc="${long_desc}
The Qt Configuration program allows end users to configure the look
and behavior of any Qt application."
revision=1
gtk_iconcache_dirs="/usr/share/icons/hicolor"
Add_dependency run libgcc
@ -14,7 +16,6 @@ Add_dependency run libstdc++
Add_dependency run glib
Add_dependency run gstreamer
Add_dependency run hicolor-icon-theme
Add_dependency run qt-plugin-gstreamer
Add_dependency run qt
do_install()