summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJocelyn Turcotte <jocelyn.turcotte@nokia.com>2010-04-07 10:53:41 (GMT)
committerJocelyn Turcotte <jocelyn.turcotte@nokia.com>2010-04-07 10:56:13 (GMT)
commit13e696c9b80349084b07beade8dafc3b5f513934 (patch)
treeaa763ab36d897649f8d6ed327ca66e435f320d6e
parent658eb0f7f595ff770c40d6bcd4279fb09aac92c5 (diff)
downloadQt-13e696c9b80349084b07beade8dafc3b5f513934.zip
Qt-13e696c9b80349084b07beade8dafc3b5f513934.tar.gz
Qt-13e696c9b80349084b07beade8dafc3b5f513934.tar.bz2
QtWebKit: Fix build on WinCE, adding missing include path.
This patch should be overwritten on next import from WebKit. Reviewed-by: TrustMe
-rw-r--r--src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri3
-rw-r--r--src/3rdparty/webkit/WebCore/WebCore.pro9
2 files changed, 3 insertions, 9 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri
index 1ad0251..fa49e4f 100644
--- a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri
+++ b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri
@@ -54,6 +54,9 @@ contains(JAVASCRIPTCORE_JIT,no) {
wince* {
INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/ce-compat
DEFINES += WINCEBASIC
+
+ INCLUDEPATH += $$PWD/../JavaScriptCore/os-wince
+ INCLUDEPATH += $$PWD/../JavaScriptCore/os-win32
}
diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro
index b20a882..ca6bf11 100644
--- a/src/3rdparty/webkit/WebCore/WebCore.pro
+++ b/src/3rdparty/webkit/WebCore/WebCore.pro
@@ -100,15 +100,6 @@ win32-msvc2005|win32-msvc2008:{
QMAKE_CXXFLAGS_RELEASE -= -GL
}
-wince* {
-# DEFINES += ENABLE_SVG=0 ENABLE_XPATH=0 ENABLE_XBL=0 \
-# ENABLE_SVG_ANIMATION=0 ENABLE_SVG_USE=0 \
-# ENABLE_SVG_FOREIGN_OBJECT=0 ENABLE_SVG_AS_IMAGE=0
-
- INCLUDEPATH += $$PWD/../JavaScriptCore/os-wince
- INCLUDEPATH += $$PWD/../JavaScriptCore/os-win32
-}
-
# Pick up 3rdparty libraries from INCLUDE/LIB just like with MSVC
win32-g++ {
TMPPATH = $$quote($$(INCLUDE))