diff options
| author | Andy Shaw <andy.shaw@qt.io> | 2017-06-20 11:36:01 +0200 |
|---|---|---|
| committer | Andy Shaw <andy.shaw@qt.io> | 2017-06-30 13:03:21 +0000 |
| commit | e06b815440cb4f07b1af7d74fd7ec0ed2a6dd936 (patch) | |
| tree | 513d1192a9eb5ad416fe48c9774f88464be1aa1e /src/core | |
| parent | ddc40f835d054e43d83554d804f57fcdfdb17e50 (diff) | |
Windows: Make sure that the path is correctly quoted
We need to ensure that the path is using forward slashes to avoid any
chances of a trailing backslash escaping the final quote. Additionally
we need to quote the whole string in case there is a space, we can't use
shell_quote for this as this preserves the backslashes which can cause
a problem.
Change-Id: Iadde9a10e2d80ad48efd695d414af58d891c7412
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/config/windows.pri | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/config/windows.pri b/src/core/config/windows.pri index ba37e5d1a..db1fbd3d7 100644 --- a/src/core/config/windows.pri +++ b/src/core/config/windows.pri @@ -57,8 +57,8 @@ msvc { SDK_PATH = $$(WINDOWSSDKDIR) VS_PATH= $$(VSINSTALLDIR) - gn_args += visual_studio_path=$$shell_quote($$VS_PATH) - gn_args += windows_sdk_path=$$shell_quote($$SDK_PATH) + gn_args += visual_studio_path=\"$$clean_path($$VS_PATH)\" + gn_args += windows_sdk_path=\"$$clean_path($$SDK_PATH)\" GN_TARGET_CPU = $$gnArch($$QT_ARCH) gn_args += target_cpu=\"$$GN_TARGET_CPU\" |