diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2013-07-23 09:43:15 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-24 11:54:14 +0200 |
| commit | 27313d12449cf9e84ca1e3ebb723c23a889edc18 (patch) | |
| tree | 11bf92a3bcc3fd3ca5f87569590f9495bbec8434 /mkspecs/features/cmake_functions.prf | |
| parent | 37ab8b4ed744f403d6c958284a9108dd1979b7f1 (diff) | |
CMake: Add a clean_path before returning a path.
The $$path may already be absolute, so prepending a slash may
result in //usr/lib, for example.
Task-number: QTBUG-32570
Change-Id: If7a4f6fbec0216404cfe48c1da62d21d75b3e272
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Diffstat (limited to 'mkspecs/features/cmake_functions.prf')
| -rw-r--r-- | mkspecs/features/cmake_functions.prf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/features/cmake_functions.prf b/mkspecs/features/cmake_functions.prf index 2dc72a7a2f..fac73b464c 100644 --- a/mkspecs/features/cmake_functions.prf +++ b/mkspecs/features/cmake_functions.prf @@ -29,7 +29,7 @@ defineReplace(cmakeTargetPath) { SYSR = $$[QT_SYSROOT] !isEmpty(SYSR): path = $$relative_path($$1, $$[QT_SYSROOT]) else: path = $$1 - return(/$$path) + return($$clean_path(/$$path)) } defineReplace(cmakeTargetPaths) { |