summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/JavaScriptCore
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2009-11-18 14:32:15 (GMT)
committerSimon Hausmann <simon.hausmann@nokia.com>2009-11-18 14:32:15 (GMT)
commit1ca2903b81c77573d37c5bd486b8d8e49a87ffc1 (patch)
tree7d670d19dae05ec6fd513dec7f4e53674117990c /src/3rdparty/webkit/JavaScriptCore
parentf6555ca5d188eef577da6aa21d8a5d28e094a33a (diff)
downloadQt-1ca2903b81c77573d37c5bd486b8d8e49a87ffc1.zip
Qt-1ca2903b81c77573d37c5bd486b8d8e49a87ffc1.tar.gz
Qt-1ca2903b81c77573d37c5bd486b8d8e49a87ffc1.tar.bz2
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 7bdf90f753d25fb1b5628b0980827df11110ad5a )
Changes in WebKit/qt since the last update: ++ b/WebKit/qt/ChangeLog 2009-11-18 Paul Olav Tvete <paul.tvete@nokia.com> Reviewed by Simon Hausmann. [Qt] Make the QWebElement::render() test pass when pixmaps aren't 32 bit. * tests/qwebelement/tst_qwebelement.cpp: (tst_QWebElement::render): 2009-11-18 Simon Hausmann <simon.hausmann@nokia.com> Reviewed by Tor Arne Vestbø. Clarify and simplify the legal section in the overview documentation, after review with our legal team. * docs/qtwebkit.qdoc: 2009-11-18 Simon Hausmann <simon.hausmann@nokia.com> Reviewed and suggested by Tor Arne Vestbø. Fix the autotest after commit ecbb2c0dd21bfc197e1f7b53150ec9b1a1d8cb8f to compare the Qt::ImFont property's family against an explicitly previously configured family. * tests/qwebpage/tst_qwebpage.cpp: (tst_QWebPage::inputMethods):
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore')
-rw-r--r--src/3rdparty/webkit/JavaScriptCore/ChangeLog12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/ChangeLog b/src/3rdparty/webkit/JavaScriptCore/ChangeLog
index 0cbb3a5..304f9ef 100644
--- a/src/3rdparty/webkit/JavaScriptCore/ChangeLog
+++ b/src/3rdparty/webkit/JavaScriptCore/ChangeLog
@@ -1,3 +1,15 @@
+2009-11-18 Harald Fernengel <harald.fernengel@nokia.com>
+
+ Reviewed by Simon Hausmann.
+
+ [Qt] Fix detection of linux-g++
+
+ Never use "linux-g++*" to check for linux-g++, since this will break embedded
+ builds which use linux-arm-g++ and friends. Use 'linux*-g++*' to check for any
+ g++ on linux mkspec.
+
+ * JavaScriptCore.pri:
+
2009-11-16 Joerg Bornemann <joerg.bornemann@trolltech.com>
Reviewed by Simon Hausmann.