diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2016-07-28 12:51:49 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2016-07-28 12:51:49 +0200 |
| commit | 9461103e4e88d652adbcd1790a21f087a1fccc53 (patch) | |
| tree | 21c2df3684d2d6807344e480f9631871308049a6 /src/3rdparty/javascriptcore/WebKit.pri | |
| parent | 6f00d966b8f1f12e4c41cf0a3e189718d10fd43f (diff) | |
| parent | b8845794b95376e8be39dbdafca2c85b5ec4c195 (diff) | |
| download | qtscript-9461103e4e88d652adbcd1790a21f087a1fccc53.tar.gz | |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I0a8e242e0c24a67fe60737674dc3a4ecf0936f3a
Diffstat (limited to 'src/3rdparty/javascriptcore/WebKit.pri')
| -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 |