diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2013-11-26 15:06:20 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-27 08:24:50 +0100 |
| commit | f03fd0d82a50361c0b89165b3f8d98d66b0a4e16 (patch) | |
| tree | d1508d86c1f851a347d87bb1afe53378ffc661df /mkspecs | |
| parent | 08f3177fdfc9aefbd4232dcd1529b537b2ca9402 (diff) | |
Remove leading '/' from target paths.
This is inappropriate on Windows, and breaks non-prefix builds there.
This is only needed when we calculate a relative path from a sysroot,
so only add it in that case.
Task-number: QTBUG-34880
Change-Id: I0e3b3d977a7b56649e4ba0077ac574aabf1dc915
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/cmake_functions.prf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/features/cmake_functions.prf b/mkspecs/features/cmake_functions.prf index a9b0c86cad..1e6b05c78e 100644 --- a/mkspecs/features/cmake_functions.prf +++ b/mkspecs/features/cmake_functions.prf @@ -27,9 +27,9 @@ defineReplace(cmakeModuleList) { defineReplace(cmakeTargetPath) { SYSR = $$[QT_SYSROOT] - !isEmpty(SYSR): path = $$relative_path($$1, $$[QT_SYSROOT]) + !isEmpty(SYSR): path = /$$relative_path($$1, $$[QT_SYSROOT]) else: path = $$1 - return($$clean_path(/$$path)) + return($$clean_path($$path)) } defineReplace(cmakeTargetPaths) { |