diff options
| author | Jüri Valdmann <juri.valdmann@qt.io> | 2018-11-16 12:14:46 +0100 |
|---|---|---|
| committer | Jüri Valdmann <juri.valdmann@qt.io> | 2019-01-22 08:39:22 +0000 |
| commit | 10d849f82e0408350d9235cafdf04cc654ac0046 (patch) | |
| tree | 48bdd3933b81681543223587e518247e0ed987ab /mkspecs | |
| parent | 59d04ad178011dd0d4e0f9ef24a55a3da98b10e1 (diff) | |
Remove directory parameter from gn_find_mocables.py
It's very unnecessary: the file parameters are already absolute paths. The
script only works because os.path.join(dir, f) == f for absolute f.
Change-Id: Iba80d5e743cf8f834ac1b051afe2ab815891c751
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/gn_generator.prf | 4 |
1 files changed, 2 insertions, 2 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_)\"]"\ ")" |