diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2016-08-29 13:57:10 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2016-08-29 13:57:10 +0200 |
| commit | 784f4ad77d5c086518afe885b570f4e09a5938e0 (patch) | |
| tree | cfe19c7e7c798dfb7b74a1aa44331ae4e1226787 /share | |
| parent | 95eea53e12ac964efe72e9145b7d822d239d4ef1 (diff) | |
| parent | 65a7c527a6210a751b2b8b5e9e8fe46a14806d28 (diff) | |
Merge 1.6 into master
Change-Id: If4ec894bc327311eeb41609a5d340a884161fda7
Diffstat (limited to 'share')
| -rw-r--r-- | share/qbs/modules/cpp/msvc.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/share/qbs/modules/cpp/msvc.js b/share/qbs/modules/cpp/msvc.js index fa3eee37a..b8464a651 100644 --- a/share/qbs/modules/cpp/msvc.js +++ b/share/qbs/modules/cpp/msvc.js @@ -123,7 +123,7 @@ function prepareCompiler(project, product, inputs, outputs, input, output) { if (defines) allDefines = allDefines.uniqueConcat(defines); for (i in allDefines) - args.push('/D' + allDefines[i]) + args.push('/D' + allDefines[i].replace(/%/g, "%%")); var minimumWindowsVersion = ModUtils.moduleProperty(product, "minimumWindowsVersion"); if (minimumWindowsVersion) { |