diff options
Diffstat (limited to 'Source/WebKit/qt/ChangeLog')
| -rw-r--r-- | Source/WebKit/qt/ChangeLog | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/Source/WebKit/qt/ChangeLog b/Source/WebKit/qt/ChangeLog index 7fef898b3..417953d1f 100644 --- a/Source/WebKit/qt/ChangeLog +++ b/Source/WebKit/qt/ChangeLog @@ -1,3 +1,22 @@ +2012-06-13 Simon Hausmann <simon.hausmann@nokia.com> + + [Qt] Remove dependency to QtScript for the Qt 5 build + https://bugs.webkit.org/show_bug.cgi?id=88993 + + Reviewed by Kenneth Rohde Christiansen. + + When building against Qt 5, replace the use of QScriptEngine::ValueOwnership with + a (compatible) QWebFrame::ValueOwnership enum. + + * Api/qwebframe.cpp: + (qtSenderCallback): + (QWebFrame::addToJavaScriptWindowObject): + * Api/qwebframe.h: + * tests/qobjectbridge/tst_qobjectbridge.cpp: + (tst_QObjectBridge::arrayObjectEnumerable): + (tst_QObjectBridge::ownership): + (tst_QObjectBridge::qObjectWrapperWithSameIdentity): + 2012-06-01 Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org> [Qt] Move QObject bridge related tests from tst_qwebframe to tst_qobjectbridge |