diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-01 11:09:57 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-01 11:10:05 +0200 |
| commit | d9ca6bcb08d9560e91a1ca1fe4542c26791b26c1 (patch) | |
| tree | ad7d8724aa61c72547a0a85a4d460a7d3bf30be9 /Source/JavaScriptCore | |
| parent | b20434396179754b292fd4a9164c2b3e338129a1 (diff) | |
| parent | f010d89fa2e4aa463d3392c5f37fa22efd48e04e (diff) | |
| download | qtwebkit-d9ca6bcb08d9560e91a1ca1fe4542c26791b26c1.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I7ef71d5a3af2acb9e41fffd9a215980dbace9d90
Diffstat (limited to 'Source/JavaScriptCore')
| -rw-r--r-- | Source/JavaScriptCore/jsc.pro | 2 |
1 files changed, 1 insertions, 1 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 |