diff options
author | Joerg Bornemann <joerg.bornemann@qt.io> | 2017-04-18 14:26:46 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-04-21 18:26:58 +0000 |
commit | 804063c0ead7f87dc85825501b7f44dd3783841a (patch) | |
tree | 51b2d912e627ac7f6dbbc8fa980528deb73a5812 /tools | |
parent | f8460367fcb6f16c6c2e06d09fabca2cd02ba854 (diff) |
Remove unused qmake functions and helper scripts
Change-Id: I8d59ccc5967193db55ac00410f09506a3b040dfe
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/buildscripts/find-included-moc-files | 15 | ||||
-rwxr-xr-x | tools/buildscripts/find-mocables | 28 | ||||
-rw-r--r-- | tools/qmake/mkspecs/features/functions.prf | 33 |
3 files changed, 0 insertions, 76 deletions
diff --git a/tools/buildscripts/find-included-moc-files b/tools/buildscripts/find-included-moc-files deleted file mode 100755 index 678b2d6f5..000000000 --- a/tools/buildscripts/find-included-moc-files +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env python - -import re, sys, os - -includedMocs = set() -dir = sys.argv[1] -files = sys.argv[2:] -for f in filter(os.path.isfile, [os.path.join(dir, f) for f in files]): - inBlockComment = False - for line in open(f).readlines(): - m = re.search('#include "(moc_\w+.cpp)"', line) - if m: - includedMocs.add(m.group(1)) -for moc in includedMocs: - print moc diff --git a/tools/buildscripts/find-mocables b/tools/buildscripts/find-mocables deleted file mode 100755 index 4bfa311b5..000000000 --- a/tools/buildscripts/find-mocables +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env python - -import re, sys, os - -mocables = set() -dir = sys.argv[1] -files = sys.argv[2:] -for f in filter(os.path.isfile, [os.path.join(dir, f) for f in files]): - inBlockComment = False - for line in open(f).readlines(): - # Block comments handling - if "/*" in line: - inBlockComment = True - if inBlockComment and "*/" in line: - inBlockComment = False - if line.find("*/") != len(line) - 3: - line = line[line.find("*/")+2:] - else: - continue - if inBlockComment: - continue - #simple comments handling - if "//" in line: - line = line.partition("//")[0] - if re.match(".*Q_OBJECT", line): - mocables.add(f) -for mocable in mocables: - print mocable diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf index 53194e421..ed1133037 100644 --- a/tools/qmake/mkspecs/features/functions.prf +++ b/tools/qmake/mkspecs/features/functions.prf @@ -328,39 +328,6 @@ defineReplace(extractCFlag) { return ($$member(OPTION, 1)) } -defineReplace(findMocables) { - mocables = $$system("$$system_path(python $$QTWEBENGINE_ROOT/tools/buildscripts/find-mocables $$_PRO_FILE_PWD_ $$1)") - mocables = $$replace(mocables, $$re_escape($$system_path($${_PRO_FILE_PWD_}/)), '') - return($$mocables) -} - -defineReplace(findIncludedMocFiles) { - return($$system("$$system_path(python $$QTWEBENGINE_ROOT/tools/buildscripts/find-included-moc-files $$_PRO_FILE_PWD_ $$1)")) -} - -defineReplace(mocOutput) { - out = $$1 - # The order is important, since the output of the second replace would end up accidentaly transformed by the first one - for(ext, $$list($${QMAKE_EXT_CPP})): \ - out = $$replace(out, ^(.*)($$re_escape($${ext})), $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC}) - for(ext, $$list($${QMAKE_EXT_H})): \ - out = $$replace(out, ^(.*)($$re_escape($${ext})), $${QMAKE_H_MOD_MOC}\\1$${first(QMAKE_EXT_CPP)}) - return($$out) -} - -defineReplace(rccOutput) { - out = $$1 - out = $$replace(out, .qrc, .cpp) - out = $$join(out, qrc_, qrc_) - return($$out) -} - -defineReplace(rccExternFunc) { - out = $$1 - out = $$replace(out, .qrc, ) - return($$out) -} - defineReplace(which) { out = $$1 win32 { |