summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/javascriptcore/WebKit.pri
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2009-12-07 05:08:30 (GMT)
committerMartin Jones <martin.jones@nokia.com>2009-12-07 05:08:30 (GMT)
commit569dfab376d9f63422791566d1888618934ffdc3 (patch)
tree7098d0e33f0cdb19b144f33318210bf801575c42 /src/3rdparty/javascriptcore/WebKit.pri
parente68fa8d463ff10f7eb2b486362ef73eea9271ff8 (diff)
parentbd23da275dc88951e17137ef02147c9b5499bce7 (diff)
downloadQt-569dfab376d9f63422791566d1888618934ffdc3.zip
Qt-569dfab376d9f63422791566d1888618934ffdc3.tar.gz
Qt-569dfab376d9f63422791566d1888618934ffdc3.tar.bz2
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/3rdparty/javascriptcore/WebKit.pri')
-rw-r--r--src/3rdparty/javascriptcore/WebKit.pri2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/javascriptcore/WebKit.pri b/src/3rdparty/javascriptcore/WebKit.pri
index 8291f30..16f89bf 100644
--- a/src/3rdparty/javascriptcore/WebKit.pri
+++ b/src/3rdparty/javascriptcore/WebKit.pri
@@ -11,7 +11,7 @@ isEmpty(OUTPUT_DIR) {
DEFINES += BUILDING_QT__=1
building-libs {
- win32-msvc*: INCLUDEPATH += $$PWD/JavaScriptCore/os-win32
+ win32-msvc*|win32-icc: INCLUDEPATH += $$PWD/JavaScriptCore/os-win32
} else {
CONFIG(QTDIR_build) {
QT += webkit