diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2012-12-05 16:53:03 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2012-12-05 17:05:47 +0100 |
| commit | 08cf377080fd97dd90109bb7bdb34890bc9f47b2 (patch) | |
| tree | eb70062986b531e6b4b3788bc09416b29cd2343b | |
| parent | 8312afe19a5e839e33b59c5fd5952fbf2a9a612e (diff) | |
Move Qt-specific MSVC flags into qtcore.qbs.
Change-Id: I479b5eef8982bed86f27f1842893fae3a5507597
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| -rw-r--r-- | share/qbs/modules/cpp/msvc.js | 2 | ||||
| -rw-r--r-- | share/qbs/modules/qt/core/qtcore.qbs | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/share/qbs/modules/cpp/msvc.js b/share/qbs/modules/cpp/msvc.js index 44d88b232..394d9431c 100644 --- a/share/qbs/modules/cpp/msvc.js +++ b/share/qbs/modules/cpp/msvc.js @@ -5,7 +5,7 @@ function prepareCompiler(product, input, outputs, platformDefines, defines, incl var debugInformation = input.module.debugInformation var architecture = input.module.architecture - var args = ['/nologo', '/c', '/Zm200', '/Zc:wchar_t-'] + var args = ['/nologo', '/c'] // C or C++ var isCxx = true; diff --git a/share/qbs/modules/qt/core/qtcore.qbs b/share/qbs/modules/qt/core/qtcore.qbs index 9a08de02f..3f7eed414 100644 --- a/share/qbs/modules/qt/core/qtcore.qbs +++ b/share/qbs/modules/qt/core/qtcore.qbs @@ -58,6 +58,15 @@ Module { cpp.frameworks: qbs.targetOS === 'mac' ? [QtFunctions.getLibraryName('Core' + libInfix, versionMajor, qbs)] : undefined cpp.rpaths: qbs.targetOS === 'linux' ? [libPath] : undefined cpp.positionIndependentCode: versionMajor >= 5 ? true : undefined + cpp.cxxFlags: { + var flags; + if (qbs.toolchain === 'msvc') { + flags = ['/Zm200']; + if (versionMajor < 5) + flags.push('/Zc:wchar_t-'); + } + return flags; + } additionalProductFileTags: ["qm"] |