diff options
author | Koen Kooi <koen@openembedded.org> | 2006-03-02 17:54:35 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-03-02 17:54:35 +0000 |
commit | 40ce95ca64d662c16cec3d1efabc966dda5a2610 (patch) | |
tree | c5687492fbbc7f7e46b8db8448b1da640fef9955 /packages/qt/qt-x11-free_4.0.1.bb | |
parent | 858ca7bc53e7c03eac036217486e87e36eb1e3e6 (diff) | |
parent | 966f3a94af2c83ffd2c634171fbe04917731b6f9 (diff) |
explicit_merge of '601faaded8a6427e29dc8dc43433fe9be662c96c'
and 'a67386ccbaf4538441ab5d8769e018207ab0c744'
using ancestor '9c1b32d8825be71ddfdcbe3ddfa31b4cc8bb2aa0'
to branch 'org.openembedded.dev'
Diffstat (limited to 'packages/qt/qt-x11-free_4.0.1.bb')
-rw-r--r-- | packages/qt/qt-x11-free_4.0.1.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/qt/qt-x11-free_4.0.1.bb b/packages/qt/qt-x11-free_4.0.1.bb index e08fc23ea0..32ddca6158 100644 --- a/packages/qt/qt-x11-free_4.0.1.bb +++ b/packages/qt/qt-x11-free_4.0.1.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" HOMEPAGE = "http://www.trolltech.com" LICENSE = "GPL QPL" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" -DEPENDS = "uicmoc4-native freetype jpeg x11 xft xext libxrender libxrandr libxcursor mysql" +DEPENDS = "uicmoc4-native freetype jpeg libx11 xft libxext libxrender libxrandr libxcursor mysql" PROVIDES = "qt4x11" # FIXME: Make it use 'our' qmake # DEPENDS += "qmake-native-2.00a" |