diff options
| author | Kai Koehne <kai.koehne@qt.io> | 2016-05-27 12:43:43 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2016-05-30 14:57:57 +0000 |
| commit | 880824649aa617a715b6d9a31fd1dba18df75a7b (patch) | |
| tree | 7db5c94a524c4521fd5576deb2d4f61972a2e199 /tools/qmake/mkspecs/features/functions.prf | |
| parent | c004741cb56c26fcb37ed4de10d063d120af39b9 (diff) | |
Fix 'The command line is too long' errors on Windows
If all arguments are made absolute the system command line easily
get's too long, which will lead to weird build errors later on.
This can be easily worked around by resolving the path names on
the callee side. Anyhow, we now have to make sure that the file
separators are consistent.
Task-number: QTBUG-53618
Change-Id: I1b28cc43dd890f6c9b723af9b70d2b2614651ba2
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
Diffstat (limited to 'tools/qmake/mkspecs/features/functions.prf')
| -rw-r--r-- | tools/qmake/mkspecs/features/functions.prf | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf index 2df689bca..a4abf458c 100644 --- a/tools/qmake/mkspecs/features/functions.prf +++ b/tools/qmake/mkspecs/features/functions.prf @@ -112,19 +112,13 @@ defineReplace(extractCFlag) { } defineReplace(findMocables) { - input = $$1 - for (file, input): \ - infiles += $$absolute_path($$file, $$_PRO_FILE_PWD_) - mocables = $$system("python $$QTWEBENGINE_ROOT/tools/buildscripts/find-mocables $$infiles") - mocables = $$replace(mocables, $$re_escape($${_PRO_FILE_PWD_}/), '') + 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) { - input = $$1 - for (file, input): \ - infiles += $$absolute_path($$file, $$_PRO_FILE_PWD_) - return($$system("python $$QTWEBENGINE_ROOT/tools/buildscripts/find-included-moc-files $$infiles")) + return($$system("$$system_path(python $$QTWEBENGINE_ROOT/tools/buildscripts/find-included-moc-files $$_PRO_FILE_PWD_ $$1)")) } defineReplace(mocOutput) { |