diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2005-09-12 16:05:40 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-09-12 16:05:40 +0000 |
| commit | 53b5f278c16b5b0ebddc2eba56e86d3a79686287 (patch) | |
| tree | caeb1255242273c1824ae59037ba5284d87382f5 | |
| parent | 48562ec91aa2f738f64e0e7ab0f006101c22655e (diff) | |
qt: revert classes and applications back to explicit DEPENDS to prevent circular dependencies
| -rw-r--r-- | classes/qt3x11.bbclass | 1 | ||||
| -rw-r--r-- | classes/qt4x11.bbclass | 1 | ||||
| -rw-r--r-- | packages/libqanava/libqanava_0.0.3.bb | 1 | ||||
| -rw-r--r-- | packages/lyx/lyx_1.3.6.bb | 2 | ||||
| -rw-r--r-- | packages/qt/qt-x11-free_3.3.5.bb | 2 | ||||
| -rw-r--r-- | packages/qt/qt-x11-free_4.0.1.bb | 2 |
6 files changed, 4 insertions, 5 deletions
diff --git a/classes/qt3x11.bbclass b/classes/qt3x11.bbclass index 1023a1f800..09b9cbac96 100644 --- a/classes/qt3x11.bbclass +++ b/classes/qt3x11.bbclass @@ -1,4 +1,3 @@ -DEPENDS += "qt3-x11" # # override variables set by qmake-base to compile Qt/X11 apps # diff --git a/classes/qt4x11.bbclass b/classes/qt4x11.bbclass index 92885aa7ee..d4ca0073df 100644 --- a/classes/qt4x11.bbclass +++ b/classes/qt4x11.bbclass @@ -1,4 +1,3 @@ -DEPENDS += "qt4-x11" # # override variables set by qmake-base to compile Qt/X11 apps # diff --git a/packages/libqanava/libqanava_0.0.3.bb b/packages/libqanava/libqanava_0.0.3.bb index 968c88745d..85be9558c7 100644 --- a/packages/libqanava/libqanava_0.0.3.bb +++ b/packages/libqanava/libqanava_0.0.3.bb @@ -3,6 +3,7 @@ to enable graphical display of graphs and other relational structures." SECTION = "x11/libs" HOMEPAGE = "http://www.libqanava.org/" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" +DEPENDS = "qt3x11" LICENSE = "GPL" PR = "r1" diff --git a/packages/lyx/lyx_1.3.6.bb b/packages/lyx/lyx_1.3.6.bb index 4c9576f935..de58313b0a 100644 --- a/packages/lyx/lyx_1.3.6.bb +++ b/packages/lyx/lyx_1.3.6.bb @@ -3,7 +3,7 @@ SECTION = "x11/office" LICENSE = "GPL" HOMEPAGE = "http://www.lyx.org" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" -DEPENDS = "boost" +DEPENDS = "boost qt3x11" RRECOMMENDS = "tetex" PR = "r1" diff --git a/packages/qt/qt-x11-free_3.3.5.bb b/packages/qt/qt-x11-free_3.3.5.bb index 1ce8234be8..2bb9453159 100644 --- a/packages/qt/qt-x11-free_3.3.5.bb +++ b/packages/qt/qt-x11-free_3.3.5.bb @@ -5,7 +5,7 @@ LICENSE = "GPL QPL" HOMEPAGE = "http://www.trolltech.com" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" DEPENDS = "uicmoc3-native freetype x11 xft xext libxrender libxrandr libxcursor mysql" -PROVIDES = "qt3-x11" +PROVIDES = "qt3x11" PR = "r10" SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2 \ diff --git a/packages/qt/qt-x11-free_4.0.1.bb b/packages/qt/qt-x11-free_4.0.1.bb index 49c7506c9f..f3b4dd3aa6 100644 --- a/packages/qt/qt-x11-free_4.0.1.bb +++ b/packages/qt/qt-x11-free_4.0.1.bb @@ -5,7 +5,7 @@ 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" -PROVIDES = "qt4-x11" +PROVIDES = "qt4x11" # FIXME: Make it use 'our' qmake # DEPENDS += "qmake-native-2.00a" PR = "r1" |