diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-12-05 13:32:35 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-12-05 13:37:21 +0100 |
| commit | 53b141dcebc2ca423dbc31e5b6321a769155e9a4 (patch) | |
| tree | e62c7d9875acab8094d64d137c90e7e5f53c0893 /mkspecs/common | |
| parent | 2c6c044500a92a3a125ce4b5d936992bdf02a487 (diff) | |
| parent | 6508fdca1dcc7105947befadba272d0fd4bbc27f (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
src/plugins/platforms/ios/quiview.mm
Change-Id: I88384c70047391c75d9ff166c8d9881ff6751dbf
Diffstat (limited to 'mkspecs/common')
| -rw-r--r-- | mkspecs/common/msvc-desktop.conf | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/mkspecs/common/msvc-desktop.conf b/mkspecs/common/msvc-desktop.conf index f7f7e54d26..20f594c601 100644 --- a/mkspecs/common/msvc-desktop.conf +++ b/mkspecs/common/msvc-desktop.conf @@ -1,10 +1,14 @@ # -# qmake configuration for Microsoft Visual Studio C/C++ Compiler -# This mkspec is used by the win32-msvc and win32-clang-msvc specs +# This file is used as a basis for the following compilers: # - +# - Microsoft C/C++ Optimizing Compiler (all desktop versions) +# - Intel C++ Compiler on Windows +# - Clang-cl +# +# Baseline: +# +# - Visual Studio 2005 (8.0), VC++ 14.0 # -# Baseline: Visual Studio 2005 (8.0), VC++ 14.0 # Version-specific settings go in msvc-version.conf (loaded by default_pre) # |