Merge remote-tracking branch 'origin/5.6' into 5.7

Change-Id: I561c00b3a844ab493a5bf0148a5923662842cf5d

2 files changed, 6 insertions, 2 deletions

diff --git a/tools/buildscripts/find-included-moc-files b/tools/buildscripts/find-included-moc-files
index e55f3824c..678b2d6f5 100755
--- a/tools/buildscripts/find-included-moc-files
+++ b/tools/buildscripts/find-included-moc-files
@@ -3,7 +3,9 @@
 import re, sys, os
 
 includedMocs = set()
-for f in filter(os.path.isfile, sys.argv[1:]):
+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)
diff --git a/tools/buildscripts/find-mocables b/tools/buildscripts/find-mocables
index 7c383cfec..4bfa311b5 100755
--- a/tools/buildscripts/find-mocables
+++ b/tools/buildscripts/find-mocables
@@ -3,7 +3,9 @@
 import re, sys, os
 
 mocables = set()
-for f in filter(os.path.isfile, sys.argv[1:]):
+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