diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-19 01:12:33 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-19 01:12:33 (GMT) |
| commit | 8a7de547942c9a660dfc45c176ea1a3027bbf99a (patch) | |
| tree | ac1eaa76630f7bbc2fc3165c2c209d2a973fd929 /src/3rdparty | |
| parent | de300d7a41b0e428ba11e6061c39580c54012dc9 (diff) | |
| parent | 7c2b43a5c824ed4d5493c233d84222be9f5865c3 (diff) | |
| download | Qt-8a7de547942c9a660dfc45c176ea1a3027bbf99a.zip Qt-8a7de547942c9a660dfc45c176ea1a3027bbf99a.tar.gz Qt-8a7de547942c9a660dfc45c176ea1a3027bbf99a.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (203 commits)
Fix compilation of OpenVG.
Fixed wrong qmake logic for Symbian.
Fixed a bug where a proxy widget received FocusIn over and over.
Fixed broken test.
Fixed recursive QMAKE_EXTRA_TARGETS for symbian makefiles.
Fix dependency so it works also on massive parrallel systems
Set PM_MenuScrollerHeight to zero
Change QS60Style to use combobox popup menu
This should likely get webkit linking again on windows/sbsv2
Handle Symbian's file name encoding, correctly.
Fix linking issues of QtOpenVG.dll
Fixed Symbian applications with DESTDIR set.
Removed a warning about generated rss files.
Revert "Temporarily disable problematic dll."
Fixed "Cannot install protected application" message on Symbian.
Worked around a crash in the elf2e32 postlinker tool.
Worked around case differences in Symbian^3 and Gnupoc.
Enabled compilation of plugins again.
Make sure target path exists in qmake_extra_pre_targetdep.flm
Added close button to Anomaly demo browser
...
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/WebCore.pro | 13 | ||||
| -rw-r--r-- | src/3rdparty/webkit/WebCore/plugins/symbian/PluginViewSymbian.cpp | 2 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro index 5654a18..a80eed4 100644 --- a/src/3rdparty/webkit/WebCore/WebCore.pro +++ b/src/3rdparty/webkit/WebCore/WebCore.pro @@ -8,7 +8,7 @@ symbian: { TARGET.CAPABILITY = All -Tcb TARGET.UID3 = 0x200267C2 - webkitlibs.sources = QtWebKit.dll + webkitlibs.sources = $$QMAKE_LIBDIR_QT/QtWebKit.dll webkitlibs.path = /sys/bin vendorinfo = \ "; Localised Vendor name" \ @@ -24,9 +24,12 @@ symbian: { DEPLOYMENT += webkitlibs webkitbackup - # 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. - MMP_RULES += "LINKEROPTION armcc --rw-base 0xE00000" + symbian-abld|symbian-sbsv2 { + # 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 + CONFIG += do_not_build_as_thumb + } } include($$PWD/../WebKit.pri) @@ -3417,7 +3420,7 @@ CONFIG(QTDIR_build):isEqual(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 4 symbian { shared { contains(CONFIG, def_files) { - defFilePath=../WebKit/qt/symbian + DEF_FILE=../WebKit/qt/symbian } } } diff --git a/src/3rdparty/webkit/WebCore/plugins/symbian/PluginViewSymbian.cpp b/src/3rdparty/webkit/WebCore/plugins/symbian/PluginViewSymbian.cpp index cf69723..fd604a0 100644 --- a/src/3rdparty/webkit/WebCore/plugins/symbian/PluginViewSymbian.cpp +++ b/src/3rdparty/webkit/WebCore/plugins/symbian/PluginViewSymbian.cpp @@ -53,7 +53,7 @@ #include "runtime_root.h" #include "QWebPageClient.h" #include <QKeyEvent> -#include <QPixmap.h> +#include <QPixmap> #include <QRegion> #include <QVector> #include <QWidget> |