diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-11-28 09:18:36 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-11-28 09:19:24 +0100 |
| commit | 83d36c3ff8eef06f2de214b453245d509a811f83 (patch) | |
| tree | 4513196ef2f9ee40c31f9ae1e4b06f778247c8b1 /mkspecs/features/cmake_functions.prf | |
| parent | 9e64fc9e1cebf1e11694c4f536881128f5aee288 (diff) | |
| parent | 82a2d28d841c7f59fa76fae6a67e1712a5fb4740 (diff) | |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I860404a1ef18c88a968a9eded405bb67967047b9
Diffstat (limited to 'mkspecs/features/cmake_functions.prf')
| -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) { |