diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-07-23 14:51:17 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-07-23 14:51:17 (GMT) |
| commit | a7bf97f437a8d4e44a9256a89d7d6ba239577949 (patch) | |
| tree | 7b1fd577d52f98d5a3f0868810c538d0e243c5e1 /src/3rdparty/webkit/WebKit | |
| parent | 28c23cdd08c3d6d9f8440047a15efcd865fa4a8c (diff) | |
| download | Qt-a7bf97f437a8d4e44a9256a89d7d6ba239577949.zip Qt-a7bf97f437a8d4e44a9256a89d7d6ba239577949.tar.gz Qt-a7bf97f437a8d4e44a9256a89d7d6ba239577949.tar.bz2 | |
Updated WebKit to 669858f9bbd4913fd16c642090375c81acbfdb04
Diffstat (limited to 'src/3rdparty/webkit/WebKit')
| -rw-r--r-- | src/3rdparty/webkit/WebKit/qt/ChangeLog | 32 | ||||
| -rw-r--r-- | src/3rdparty/webkit/WebKit/qt/qt_webkit_version.pri | 1 | ||||
| -rw-r--r-- | src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp | 3 |
3 files changed, 36 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/ChangeLog b/src/3rdparty/webkit/WebKit/qt/ChangeLog index 63d5568..1075b24 100644 --- a/src/3rdparty/webkit/WebKit/qt/ChangeLog +++ b/src/3rdparty/webkit/WebKit/qt/ChangeLog @@ -1,3 +1,35 @@ +2010-07-23 David Boddie <dboddie@trolltech.com> + + Reviewed by Simon Hausmann. + + Doc: Fixed incorrect QML property type. + + * declarative/qdeclarativewebview.cpp: + +2010-07-23 Simon Hausmann <simon.hausmann@nokia.com> + + [Qt] Build fix for Qt apps + + Add webkit to QT_CONFIG. qconfig.pri will read qt_webkit_version.pri and + that's how it will pick up webkit in QT_CONFIG. + + * qt_webkit_version.pri: + +2010-07-09 Kent Hansen <kent.hansen@nokia.com> + + Reviewed by Kenneth Rohde Christiansen. + + [Qt] Skip test that never terminates on maemo5 + + Due to https://bugs.webkit.org/show_bug.cgi?id=38538 + the tst_QWebPage::infiniteLoopJS() autotest never terminates. + Skip the test so that the test case may run to completion. + + Patch by Dominik Holland <dominik.holland@nokia.com> + + * tests/qwebpage/tst_qwebpage.cpp: + (tst_QWebPage::infiniteLoopJS): + 2010-07-09 Simon Hausmann <simon.hausmann@nokia.com> Unreviewed trivial Symbian build fix. diff --git a/src/3rdparty/webkit/WebKit/qt/qt_webkit_version.pri b/src/3rdparty/webkit/WebKit/qt/qt_webkit_version.pri index ffd192c..d8cf06c 100644 --- a/src/3rdparty/webkit/WebKit/qt/qt_webkit_version.pri +++ b/src/3rdparty/webkit/WebKit/qt/qt_webkit_version.pri @@ -2,3 +2,4 @@ QT_WEBKIT_VERSION = 4.7.0 QT_WEBKIT_MAJOR_VERSION = 4 QT_WEBKIT_MINOR_VERSION = 7 QT_WEBKIT_PATCH_VERSION = 0 +QT_CONFIG *= webkit diff --git a/src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp b/src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp index 0f2ca22..b7ffb8a 100644 --- a/src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp +++ b/src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp @@ -219,6 +219,9 @@ public slots: void tst_QWebPage::infiniteLoopJS() { +#ifdef Q_WS_MAEMO_5 + QSKIP("Test never terminates on Maemo 5 : https://bugs.webkit.org/show_bug.cgi?id=38538", SkipAll); +#endif JSTestPage* newPage = new JSTestPage(m_view); m_view->setPage(newPage); m_view->setHtml(QString("<html><bodytest</body></html>"), QUrl()); |