diff options
| -rw-r--r-- | mkspecs/features/gn_generator.prf | 4 | ||||
| -rw-r--r-- | tools/scripts/gn_find_mocables.py | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/mkspecs/features/gn_generator.prf b/mkspecs/features/gn_generator.prf index c1399a453..e6ae263ac 100644 --- a/mkspecs/features/gn_generator.prf +++ b/mkspecs/features/gn_generator.prf @@ -29,12 +29,12 @@ isEmpty(GN_FIND_MOCABLES_SCRIPT): GN_FIND_MOCABLES_SCRIPT = "//build/gn_find_moc # MOC SETUP GN_CONTENTS += "moc_source_h_files = exec_script(\"$$GN_FIND_MOCABLES_SCRIPT\"," -GN_CONTENTS += " [ \"$$_PRO_FILE_PWD_\"," +GN_CONTENTS += " [" for (headerfile, HEADERS): GN_CONTENTS += " \"$$GN_SRC_DIR/$$headerfile\"," GN_CONTENTS += " ], \"list lines\", [\"$$system_path($$_PRO_FILE_)\"]"\ ")" GN_CONTENTS += "moc_source_cpp_files = exec_script(\"$$GN_FIND_MOCABLES_SCRIPT\"," -GN_CONTENTS += " [ \"$$_PRO_FILE_PWD_\"," +GN_CONTENTS += " [" for (sourcefile, SOURCES): GN_CONTENTS += " \"$$GN_SRC_DIR/$$sourcefile\"," GN_CONTENTS += " ], \"list lines\", [\"$$system_path($$_PRO_FILE_)\"]"\ ")" diff --git a/tools/scripts/gn_find_mocables.py b/tools/scripts/gn_find_mocables.py index d97dcb534..d1f682456 100644 --- a/tools/scripts/gn_find_mocables.py +++ b/tools/scripts/gn_find_mocables.py @@ -32,10 +32,9 @@ import os mocables = set() 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]): +for f in filter(os.path.isfile, files): inBlockComment = False for line in open(f).readlines(): # Block comments handling |