diff options
| author |   Mark Hatle <mark.hatle@windriver.com> | 2012-09-07 17:07:11 -0500 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-12 14:44:52 +0100 |
| commit | a7c5cec5fc63b4a26d84673460426b35669068dc (patch) | |
| tree | cd9a9a839030237e46dd8fddba86b9b95793c353 /meta/recipes-qt | |
| parent | 5fd3503d4a438d126f44fe8118e9ea465e7699c2 (diff) | |
| download | openembedded-core-a7c5cec5fc63b4a26d84673460426b35669068dc.tar.gz | |
qt4: Update qt4.inc to remove staticdev deps in -dbg packages
It appears that the qt4.inc had a copy/paste error relating to creating
a list of staticdev packages, that caused them to show up as dependencies
in the -dbg package.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-qt')
| -rw-r--r-- | meta/recipes-qt/qt4/qt4-embedded.inc | 2 | ||||
| -rw-r--r-- | meta/recipes-qt/qt4/qt4-x11-free.inc | 2 | ||||
| -rw-r--r-- | meta/recipes-qt/qt4/qt4.inc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc index de1b88ee83..53eb652b08 100644 --- a/meta/recipes-qt/qt4/qt4-embedded.inc +++ b/meta/recipes-qt/qt4/qt4-embedded.inc @@ -2,7 +2,7 @@ DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is SECTION = "libs" HOMEPAGE = "http://qt.nokia.com" DEPENDS += "directfb tslib" -INC_PR = "r47" +INC_PR = "r48" QT_BASE_LIB ?= "libqt-embedded" diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc index e229b85327..0ae74f7f3d 100644 --- a/meta/recipes-qt/qt4/qt4-x11-free.inc +++ b/meta/recipes-qt/qt4/qt4-x11-free.inc @@ -6,7 +6,7 @@ SECTION = "x11/libs" DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor" PROVIDES += "qt4-x11" -INC_PR = "r45" +INC_PR = "r46" QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} " QT_GLFLAGS_qemux86 = "-opengl" diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc index b8c6baf3a2..ba231baa5d 100644 --- a/meta/recipes-qt/qt4/qt4.inc +++ b/meta/recipes-qt/qt4/qt4.inc @@ -61,7 +61,7 @@ python __anonymous () { staticdev_packages.append("%s-staticdev" % pkg) for name in d.getVar("OTHER_PACKAGES", True).split(): dbg_packages.append("%s-dbg" % name) - dbg_packages.append("%s-staticdev" % name) + staticdev_packages.append("%s-staticdev" % name) for name in d.getVar("QT_EXTRA_LIBS", True).split(): pkg = d.getVar("QT_BASE_LIB", True) + name.lower().replace("qt", "").replace("_", "-") + "4" |