diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2016-06-20 14:08:56 -0700 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2016-07-08 21:19:50 +0000 |
| commit | 0cc34edfb058f902e0f6cd0d0c1a56da66366385 (patch) | |
| tree | 5b37c1da2ebb2450e2e2e0b6cc625d2b35366588 | |
| parent | f293b707d56be264b6d688fd159e5b6306092491 (diff) | |
| download | qtwebkit-0cc34edfb058f902e0f6cd0d0c1a56da66366385.tar.gz | |
Update the detection of MSVC versions to be forward-compatible
Qt 5.8 may deprecate the win32-msvc20xx mkspecs, so use the MSVC_VER
variable to detect which version of MSVC it is.
This commit removes the detection for win32-icc, as it really depended
on what version of MSVC headers it was targeting. With Qt prior to 5.8,
it was not possible to detect it anyway, so the rule was broken anyway
(ICC prior to 16 only worked with MSVC <= 2013, but ICC 17 will work
with 2015).
Change-Id: Ib57b52598e2f452985e9fffd1459e682978341f5
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | Source/JavaScriptCore/jsc.pro | 2 | ||||
| -rw-r--r-- | Source/WTF/WTF.pri | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Source/JavaScriptCore/jsc.pro b/Source/JavaScriptCore/jsc.pro index 91ebcc2a0..4efe024d6 100644 --- a/Source/JavaScriptCore/jsc.pro +++ b/Source/JavaScriptCore/jsc.pro @@ -13,7 +13,7 @@ QT -= gui win32-*: CONFIG += console win32-msvc*: CONFIG += exceptions_off stl_off -win32-msvc2005|win32-msvc2008|win32-msvc2010|win32-msvc2012|win32-msvc2013|win32-icc: INCLUDEPATH += $$ROOT_WEBKIT_DIR/Source/JavaScriptCore/os-win32 +contains(MSVC_VER, "(9|10|11|12)\.0)"): INCLUDEPATH += $$ROOT_WEBKIT_DIR/Source/JavaScriptCore/os-win32 WEBKIT += javascriptcore wtf diff --git a/Source/WTF/WTF.pri b/Source/WTF/WTF.pri index b4f7765ac..1f4866d66 100644 --- a/Source/WTF/WTF.pri +++ b/Source/WTF/WTF.pri @@ -49,4 +49,4 @@ mac { } # MSVC is lacking stdint.h as well as inttypes.h. -win32-msvc2005|win32-msvc2008|win32-msvc2010|win32-msvc2012|win32-msvc2013|win32-icc|wince*: INCLUDEPATH += $$ROOT_WEBKIT_DIR/Source/JavaScriptCore/os-win32 +contains(MSVC_VER, "(9|10|11|12)\.0"): INCLUDEPATH += $$ROOT_WEBKIT_DIR/Source/JavaScriptCore/os-win32 |