diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-05-29 16:44:07 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-05-29 14:45:25 +0000 |
| commit | 783776eece07391bf424f4a5bc27ed64328e645a (patch) | |
| tree | 694974b7ad86856dee6034532537409701048b70 /Source/JavaScriptCore | |
| parent | 64a79a104ded96a5ecc092a38ca4a6a58ee85be5 (diff) | |
| parent | 540119ba890eb25836980c433d041b687428fdb2 (diff) | |
| download | qtwebkit-783776eece07391bf424f4a5bc27ed64328e645a.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Change-Id: Iceb5c402acfd83632007cb5f7673b4d6cda08e6b
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 dfd73e825..91ebcc2a0 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-msvc*|win32-icc: INCLUDEPATH += $$ROOT_WEBKIT_DIR/Source/JavaScriptCore/os-win32 +win32-msvc2005|win32-msvc2008|win32-msvc2010|win32-msvc2012|win32-msvc2013|win32-icc: INCLUDEPATH += $$ROOT_WEBKIT_DIR/Source/JavaScriptCore/os-win32 WEBKIT += javascriptcore wtf |