summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-03 10:59:25 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-05 18:22:56 (GMT)
commit06f2f8ce0a3093973ca54b48f542f8485b666079 (patch)
treedbcfa5c491eb2e5d237aa539cb7c6e77dc07dd6f /meta/recipes-qt
parentd01dadfb87cfd2284b3e849d35a35fe5df0239c4 (diff)
downloadpoky-06f2f8ce0a3093973ca54b48f542f8485b666079.tar.gz
meta: Convert getVar/getVarFlag(xxx, 1) -> (xxx, True)
Using "1" with getVar is bad coding style and "True" is preferred. This patch is a sed over the meta directory of the form: sed \ -e 's:\(\.getVar([^,()]*, \)1 *):\1True):g' \ -e 's:\(\.getVarFlag([^,()]*, [^,()]*, \)1 *):\1True):g' \ -i `grep -ril getVar *` Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt')
-rw-r--r--meta/recipes-qt/qt4-graphics-system/qt4-graphics-system_1.0.bb2
-rw-r--r--meta/recipes-qt/qt4/qt4.inc6
-rw-r--r--meta/recipes-qt/qt4/qt4_arch.inc2
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 b3aa1e5..bae0340 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"
9VIRTUAL-RUNTIME_xserver_common ?= "x11-common" 9VIRTUAL-RUNTIME_xserver_common ?= "x11-common"
10 10
11def _get_extra_rdepends(d): 11def _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 2956aed..4d71913 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 46d65a2..bde68dc 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
5def qt_arch(d): 5def 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):