summaryrefslogtreecommitdiffstats
path: root/build/qt5.py
diff options
context:
space:
mode:
authorUwe Klotz <uwe_klotz@web.de>2017-11-16 19:06:12 +0100
committerUwe Klotz <uwe_klotz@web.de>2017-11-16 19:06:12 +0100
commit1e6511a88dfc6c284c13d1eb329e931b225e6952 (patch)
tree67b3bbf451a8d2e38972eca2a17403e1dfec531a /build/qt5.py
parent751bb894aa3524f6b54a8cd523f5ef4928361205 (diff)
Replace get_contents() with get_text_contents()
Diffstat (limited to 'build/qt5.py')
-rw-r--r--build/qt5.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/build/qt5.py b/build/qt5.py
index cc83c5134b..25a3f9d6f2 100644
--- a/build/qt5.py
+++ b/build/qt5.py
@@ -191,7 +191,7 @@ class _Automoc:
if h:
if moc_options['debug']:
print("scons: qt5: Scanning '%s' (header of '%s')" % (str(h), str(cpp)))
- h_contents = h.get_contents()
+ h_contents = h.get_text_contents()
if moc_options['gobble_comments']:
h_contents = self.ccomment.sub('', h_contents)
h_contents = self.cxxcomment.sub('', h_contents)
@@ -259,7 +259,7 @@ class _Automoc:
if h:
if moc_options['debug']:
print("scons: qt5: Scanning '%s' (header of '%s')" % (str(h), str(cpp)))
- h_contents = h.get_contents()
+ h_contents = h.get_text_contents()
if moc_options['gobble_comments']:
h_contents = self.ccomment.sub('', h_contents)
h_contents = self.cxxcomment.sub('', h_contents)
@@ -342,7 +342,7 @@ class _Automoc:
# c or fortran source
continue
try:
- cpp_contents = cpp.get_contents()
+ cpp_contents = cpp.get_text_contents()
if moc_options['gobble_comments']:
cpp_contents = self.ccomment.sub('', cpp_contents)
cpp_contents = self.cxxcomment.sub('', cpp_contents)
@@ -415,7 +415,7 @@ def __scanResources(node, env, path, arg):
else:
result.append(itemPath)
return result
- contents = node.get_contents()
+ contents = node.get_text_contents()
includes = qrcinclude_re.findall(contents)
qrcpath = os.path.dirname(node.path)
dirs = [included for included in includes if os.path.isdir(os.path.join(qrcpath,included))]