From 659b49e7f6ffade3e471037397137749542d703e Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Wed, 26 Apr 2017 13:10:13 +0000 Subject: [PATCH] remove reference to the removed opengl component from the scripts Signed-off-by: Ivailo Monev --- scripts/genmap.py | 9 ++++----- scripts/updatetranslations.py | 4 ++-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/scripts/genmap.py b/scripts/genmap.py index 73bf19608..450094ea0 100755 --- a/scripts/genmap.py +++ b/scripts/genmap.py @@ -16,7 +16,6 @@ components = { 'ScriptTools': 'Q_SCRIPTTOOLS_EXPORT', 'Test': 'Q_TEST_EXPORT', 'UiTools': 'Q_UITOOLS_EXPORT', - 'OpenGL': 'Q_OPENGL_EXPORT', } mapoutput = 'src/shared/qclass_lib_map.h' classcount = -1 @@ -25,7 +24,7 @@ mapdata = '// Automatically generated by genmap.py, DO NOT EDIT!\n\n' mapdata += '#ifndef QT_CLASS_MAP_H\n#define QT_CLASS_MAP_H\n\n' mapdata += 'static const ClassInfoEntry qclass_lib_map[] = {\n' -def exportscan(sdir, keyword, component): +def exportscan(sdir, pattern, component): dirmap = '' global classcount for sroot, sdir, lfiles in os.walk(sdir): @@ -36,7 +35,7 @@ def exportscan(sdir, keyword, component): with open(sfull, 'rb') as f: scontent = f.read() scontent = scontent.decode('utf-8') - for match in re.findall('(?:class|struct) (?:%s) (\w+)' % keyword, scontent): + for match in re.findall('(?:class|struct) (?:%s) (\w+)' % pattern, scontent): if match in mappedclasses: continue mappedclasses.append(match) @@ -45,8 +44,8 @@ def exportscan(sdir, keyword, component): return dirmap for component in components: - keyword = components[component] - mapdata += exportscan('src/%s' % component.lower(), keyword, 'Qt%s' % component) + pattern = components[component] + mapdata += exportscan('src/%s' % component.lower(), pattern, 'Qt%s' % component) mapdata += '};\n' mapdata += 'static const int qclass_lib_count = %d;\n\n' % classcount diff --git a/scripts/updatetranslations.py b/scripts/updatetranslations.py index c16597526..94cece559 100755 --- a/scripts/updatetranslations.py +++ b/scripts/updatetranslations.py @@ -2,8 +2,8 @@ import os, glob, subprocess, shlex -components = ('core', 'dbus', 'declarative', 'gui', 'network', 'opengl', - 'plugins', 'script', 'scripttools', 'sql', 'svg', 'test', 'uitools', 'xml') +components = ('core', 'dbus', 'declarative', 'gui', 'network', 'plugins', + 'script', 'scripttools', 'sql', 'svg', 'test', 'uitools', 'xml') cfiles = [] tfiles = [] -- 2.11.0