diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2016-06-20 13:59:29 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2016-07-02 00:41:24 +0000 |
| commit | f1045b954411fb01cfeae63fda2645c3713e7adc (patch) | |
| tree | 42509b1116dde7c087ae0fe2925a224f031658a5 | |
| parent | e7db88eb5cc1b51dd27b5b614909c1f9670977d3 (diff) | |
| download | qtscript-f1045b954411fb01cfeae63fda2645c3713e7adc.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: Simon Hausmann <simon.hausmann@qt.io>
| -rw-r--r-- | src/3rdparty/javascriptcore/WebKit.pri | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/javascriptcore/WebKit.pri b/src/3rdparty/javascriptcore/WebKit.pri index 932b17a..18898b3 100644 --- a/src/3rdparty/javascriptcore/WebKit.pri +++ b/src/3rdparty/javascriptcore/WebKit.pri @@ -20,7 +20,7 @@ isEmpty(OUTPUT_DIR) { DEFINES += BUILDING_QT__=1 building-libs { - win32-msvc2008|win32-msvc2010|win32-msvc2012|win32-msvc2013|win32-icc: INCLUDEPATH += $$PWD/JavaScriptCore/os-win32 + contains(MSVC_VER, "(9|10|11|12)\.0"): INCLUDEPATH += $$PWD/JavaScriptCore/os-win32 } else { CONFIG(QTDIR_build) { QT += webkit |