diff options
Diffstat (limited to 'meta/recipes-qt')
-rw-r--r-- | meta/recipes-qt/qt4-graphics-system/qt4-graphics-system_1.0.bb | 2 | ||||
-rw-r--r-- | meta/recipes-qt/qt4/qt4.inc | 6 | ||||
-rw-r--r-- | meta/recipes-qt/qt4/qt4_arch.inc | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-qt/qt4-graphics-system/qt4-graphics-system_1.0.bb b/meta/recipes-qt/qt4-graphics-system/qt4-graphics-system_1.0.bb index b3aa1e559c..bae0340faf 100644 --- a/meta/recipes-qt/qt4-graphics-system/qt4-graphics-system_1.0.bb +++ b/meta/recipes-qt/qt4-graphics-system/qt4-graphics-system_1.0.bb | |||
@@ -9,7 +9,7 @@ QT_GRAPHICS_SYSTEM ?= "raster" | |||
9 | VIRTUAL-RUNTIME_xserver_common ?= "x11-common" | 9 | VIRTUAL-RUNTIME_xserver_common ?= "x11-common" |
10 | 10 | ||
11 | def _get_extra_rdepends(d): | 11 | def _get_extra_rdepends(d): |
12 | gs = d.getVar('QT_GRAPHICS_SYSTEM', 1) | 12 | gs = d.getVar('QT_GRAPHICS_SYSTEM', True) |
13 | if gs == "opengl": | 13 | if gs == "opengl": |
14 | return "qt4-plugin-graphicssystems-glgraphicssystem" | 14 | return "qt4-plugin-graphicssystems-glgraphicssystem" |
15 | 15 | ||
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc index 2956aed604..4d719138ca 100644 --- a/meta/recipes-qt/qt4/qt4.inc +++ b/meta/recipes-qt/qt4/qt4.inc | |||
@@ -45,7 +45,7 @@ python __anonymous () { | |||
45 | lib_packages = [] | 45 | lib_packages = [] |
46 | dev_packages = [] | 46 | dev_packages = [] |
47 | dbg_packages = [] | 47 | dbg_packages = [] |
48 | for name in d.getVar("QT_LIB_NAMES", 1).split(): | 48 | for name in d.getVar("QT_LIB_NAMES", True).split(): |
49 | pkg = d.getVar("QT_BASE_LIB", True) + name.lower().replace("qt", "").replace("_", "-") + "4" | 49 | pkg = d.getVar("QT_BASE_LIB", True) + name.lower().replace("qt", "").replace("_", "-") + "4" |
50 | # NOTE: the headers for QtAssistantClient are different | 50 | # NOTE: the headers for QtAssistantClient are different |
51 | incname = name.replace("QtAssistantClient", "QtAssistant") | 51 | incname = name.replace("QtAssistantClient", "QtAssistant") |
@@ -61,10 +61,10 @@ python __anonymous () { | |||
61 | lib_packages.append(pkg) | 61 | lib_packages.append(pkg) |
62 | dev_packages.append("%s-dev" % pkg) | 62 | dev_packages.append("%s-dev" % pkg) |
63 | dbg_packages.append("%s-dbg" % pkg) | 63 | dbg_packages.append("%s-dbg" % pkg) |
64 | for name in d.getVar("OTHER_PACKAGES", 1).split(): | 64 | for name in d.getVar("OTHER_PACKAGES", True).split(): |
65 | dbg_packages.append("%s-dbg" % name) | 65 | dbg_packages.append("%s-dbg" % name) |
66 | 66 | ||
67 | for name in d.getVar("QT_EXTRA_LIBS", 1).split(): | 67 | for name in d.getVar("QT_EXTRA_LIBS", True).split(): |
68 | pkg = d.getVar("QT_BASE_LIB", True) + name.lower().replace("qt", "").replace("_", "-") + "4" | 68 | pkg = d.getVar("QT_BASE_LIB", True) + name.lower().replace("qt", "").replace("_", "-") + "4" |
69 | d.setVar("FILES_%s" % pkg, "${libdir}/lib%(name)s.so.*" % locals()) | 69 | d.setVar("FILES_%s" % pkg, "${libdir}/lib%(name)s.so.*" % locals()) |
70 | d.setVar("FILES_%s-dev" % pkg, """${libdir}/lib%(name)s.prl | 70 | d.setVar("FILES_%s-dev" % pkg, """${libdir}/lib%(name)s.prl |
diff --git a/meta/recipes-qt/qt4/qt4_arch.inc b/meta/recipes-qt/qt4/qt4_arch.inc index 46d65a20d7..bde68dc2e0 100644 --- a/meta/recipes-qt/qt4/qt4_arch.inc +++ b/meta/recipes-qt/qt4/qt4_arch.inc | |||
@@ -4,7 +4,7 @@ ARM_INSTRUCTION_SET = "arm" | |||
4 | 4 | ||
5 | def qt_arch(d): | 5 | def qt_arch(d): |
6 | import bb, re | 6 | import bb, re |
7 | arch = d.getVar('TARGET_ARCH', 1) | 7 | arch = d.getVar('TARGET_ARCH', True) |
8 | if re.match("^i.86$", arch): | 8 | if re.match("^i.86$", arch): |
9 | arch = "i386" | 9 | arch = "i386" |
10 | elif re.match("^arm.*", arch): | 10 | elif re.match("^arm.*", arch): |