diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-03-05 08:09:56 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-03-05 08:09:56 (GMT) |
| commit | aff7468baf9a27fad9fa8a180b90d2a0db8b8c10 (patch) | |
| tree | 00700a96fbb0229139bce3c4881b7242a9c4117a /src/3rdparty/webkit/WebCore/WebCore.pro | |
| parent | ac192ca74b90e059f96d6c24c4bb8295778d1eaa (diff) | |
| download | Qt-aff7468baf9a27fad9fa8a180b90d2a0db8b8c10.zip Qt-aff7468baf9a27fad9fa8a180b90d2a0db8b8c10.tar.gz Qt-aff7468baf9a27fad9fa8a180b90d2a0db8b8c10.tar.bz2 | |
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( f3110d2f94c825477afac054ed448e45d47f5670 )
Changes in WebKit/qt since the last update:
++ b/WebKit/qt/ChangeLog
2010-03-04 Simon Hausmann <simon.hausmann@nokia.com>
Reviewed by Kenneth Rohde Christiansen.
[Qt] qwebelement.h does not include QtCore headers correctly
https://bugs.webkit.org/show_bug.cgi?id=35748
The header files of QtCore must be included as QtCore/foo.h.
See also http://bugreports.qt.nokia.com/browse/QTBUG-8661
* Api/qwebelement.h:
Diffstat (limited to 'src/3rdparty/webkit/WebCore/WebCore.pro')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/WebCore.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro index c9b622a..5654a18 100644 --- a/src/3rdparty/webkit/WebCore/WebCore.pro +++ b/src/3rdparty/webkit/WebCore/WebCore.pro @@ -26,7 +26,7 @@ symbian: { # RO text (code) section in qtwebkit.dll exceeds allocated space for gcce udeb target. # Move RW-section base address to start from 0xE00000 instead of the toolchain default 0x400000. - QMAKE_LFLAGS.ARMCC += --rw-base 0xE00000 + MMP_RULES += "LINKEROPTION armcc --rw-base 0xE00000" } include($$PWD/../WebKit.pri) |