summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/WebCore/WebCore.pro
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2010-05-07 08:22:23 (GMT)
committerSimon Hausmann <simon.hausmann@nokia.com>2010-05-07 08:22:23 (GMT)
commit2ea7f415dbc26cc505fe04f6f6a6ce7766d19608 (patch)
tree7243c1e0f755dea2d1ff17427df8681f55274818 /src/3rdparty/webkit/WebCore/WebCore.pro
parent91b2bd620bf10ddd9de65f2c3ac7781e591844d4 (diff)
downloadQt-2ea7f415dbc26cc505fe04f6f6a6ce7766d19608.zip
Qt-2ea7f415dbc26cc505fe04f6f6a6ce7766d19608.tar.gz
Qt-2ea7f415dbc26cc505fe04f6f6a6ce7766d19608.tar.bz2
Updated WebKit to 07b60cf799680fcfb7785ee88e14f8030a5dbfa2
Bugzilla fixes integrated in this commit: || <https://webkit.org/b/37445> || [Qt] Regression: Google calendar edit event details gets stuck on loading || || <https://webkit.org/b/38439> || [Qt] QT_MOBILE_THEME compile time flag || || <https://webkit.org/b/37803> || Spatial Navigation: adapt the logic of {deep}findFocusableNodeInDirection to do traversal starting from Node* not Document* || || <https://webkit.org/b/36755> || [Qt] REGRESSION: Loading of external CSS and JS files over network fails in some cases || || <https://webkit.org/b/36533> || [Qt] Compilation error on Qt for Embedded Linux built with -qconfig small || || <https://webkit.org/b/38585> || Spatial Navigation: add a layout test which runs with Frame Flattening ON ||
Diffstat (limited to 'src/3rdparty/webkit/WebCore/WebCore.pro')
-rw-r--r--src/3rdparty/webkit/WebCore/WebCore.pro18
1 files changed, 12 insertions, 6 deletions
diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro
index 11d3c8b..beeb529 100644
--- a/src/3rdparty/webkit/WebCore/WebCore.pro
+++ b/src/3rdparty/webkit/WebCore/WebCore.pro
@@ -126,6 +126,10 @@ maemo5|symbian|embedded {
}
maemo5 {
+ DEFINES += WTF_USE_QT_MOBILE_THEME=1
+}
+
+contains(DEFINES, WTF_USE_QT_MOBILE_THEME=1) {
DEFINES += ENABLE_NO_LISTBOX_RENDERING=1
}
@@ -2107,13 +2111,15 @@ SOURCES += \
../WebKit/qt/Api/qwebinspector.cpp \
../WebKit/qt/Api/qwebkitversion.cpp
+
+contains(DEFINES, WTF_USE_QT_MOBILE_THEME=1) {
+ HEADERS += platform/qt/Maemo5Webstyle.h
+ SOURCES += platform/qt/Maemo5Webstyle.cpp
+}
+
maemo5 {
- HEADERS += \
- ../WebKit/qt/WebCoreSupport/QtMaemoWebPopup.h \
- platform/qt/Maemo5Webstyle.h
- SOURCES += \
- ../WebKit/qt/WebCoreSupport/QtMaemoWebPopup.cpp \
- platform/qt/Maemo5Webstyle.cpp
+ HEADERS += ../WebKit/qt/WebCoreSupport/QtMaemoWebPopup.h
+ SOURCES += ../WebKit/qt/WebCoreSupport/QtMaemoWebPopup.cpp
}