summaryrefslogtreecommitdiffstats
path: root/mkspecs/features/win32
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2016-11-16 14:18:42 +0100
committerOswald Buddenhagen <oswald.buddenhagen@qt.io>2016-12-23 13:45:26 +0000
commit4d9fbb33458c82aaf37d9712495a0653aae70533 (patch)
treee4c5bb186ccf8b05185ae96a444b7667bb8209d5 /mkspecs/features/win32
parent5196d5602c70b8d4c08e49921e9459425ada8a42 (diff)
Remove hard-coded MS compiler versions from the mkspecs
We're asking the compiler anyway, so we can fully use this information just as well. Note that this actually happens after the spec itself has been processed, so it was necessary to delay the version-specific flag handling as well. Change-Id: Ib57b52598e2f452985e9fffd14587b581d946022 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'mkspecs/features/win32')
-rw-r--r--mkspecs/features/win32/default_pre.prf2
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/features/win32/default_pre.prf b/mkspecs/features/win32/default_pre.prf
index 385184f632..11160f5b5c 100644
--- a/mkspecs/features/win32/default_pre.prf
+++ b/mkspecs/features/win32/default_pre.prf
@@ -1,3 +1,3 @@
CONFIG = rtti_off incremental_off windows $$CONFIG
load(default_pre)
-
+msvc:!intel_icl:!clang_cl: include(../../common/msvc-version.conf)