diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-12-29 16:06:12 (GMT) |
|---|---|---|
| committer | Jesper Thomschutz <jesper.thomschutz@nokia.com> | 2010-01-13 13:17:57 (GMT) |
| commit | ff10ade389214795f8a3fff59971d77a3c784df0 (patch) | |
| tree | 6ef3108957413b8aea40f53a0c7661cfc7e0e94a /doc/src/snippets/code/src_sql_models_qsqlquerymodel.cpp | |
| parent | e60277e8d5934ca9fff8abaf9493a33985ee34c4 (diff) | |
| download | Qt-ff10ade389214795f8a3fff59971d77a3c784df0.zip Qt-ff10ade389214795f8a3fff59971d77a3c784df0.tar.gz Qt-ff10ade389214795f8a3fff59971d77a3c784df0.tar.bz2 | |
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( eb1c86da9f5fa43a0e126ef58ab11cbd4d200af7 )
Changes in WebKit/qt since the last update:
++ b/WebKit/qt/ChangeLog
2009-12-14 Holger Hans Peter Freyther <zecke@selfish.org>
Reviewed by Kenneth Rohde Christiansen.
[Qt] Fix JavaScript prompt behavior for empty/null strings.
https://bugs.webkit.org/show_bug.cgi?id=30914
The patch is based on the work done by Gupta Manish.
In the default implementation of the JavaScript prompt
we are using a QInputDialog to get the text and this has
one quirk with regard to not entering any text.
In other WebKit ports and in Firefox an empty string is
returned but in the Qt case it is a null string.
Change the API documentation in QWebPage to mention we want to
have a non null string but do the fixup in the ChromeClientQt
to support existing code.
* Api/qwebpage.cpp:
(QWebPage::javaScriptPrompt): Change API documentation
* WebCoreSupport/ChromeClientQt.cpp:
(WebCore::ChromeClientQt::runJavaScriptPrompt): Fixup null QString
(cherry picked from commit 3185723b69133530016528c8cef57da247589d30)
Diffstat (limited to 'doc/src/snippets/code/src_sql_models_qsqlquerymodel.cpp')
0 files changed, 0 insertions, 0 deletions