diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-05-29 14:47:44 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-05-29 14:47:44 +0000 |
| commit | dbbef9bee537a88a9d3e1656f4b7935023aacacf (patch) | |
| tree | b4294b2e3a91af8344b3698fe5ee96073b708976 /Source/JavaScriptCore | |
| parent | eb533c18d91cefc5ba455f53a907a614037333f2 (diff) | |
| parent | 783776eece07391bf424f4a5bc27ed64328e645a (diff) | |
| download | qtwebkit-dbbef9bee537a88a9d3e1656f4b7935023aacacf.tar.gz | |
Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5
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 |