summaryrefslogtreecommitdiffstats
path: root/util/s60pixelmetrics/pm_mapperview.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2010-01-29 13:59:39 (GMT)
committerJesper Thomschutz <jesper.thomschutz@nokia.com>2010-02-03 12:36:18 (GMT)
commitea55c582dbe3dfab55e08ca1667ef2a5ca815b8c (patch)
tree68e38f8b723993c310795da09e00a9588032b386 /util/s60pixelmetrics/pm_mapperview.cpp
parentfda9e20ce8cf7ce5fb6cdbb07823172813440af4 (diff)
downloadQt-ea55c582dbe3dfab55e08ca1667ef2a5ca815b8c.zip
Qt-ea55c582dbe3dfab55e08ca1667ef2a5ca815b8c.tar.gz
Qt-ea55c582dbe3dfab55e08ca1667ef2a5ca815b8c.tar.bz2
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( ca7b2e1e1ca558050cf49dd8f7c9b35e4b9d4df5 )
Changes in WebKit/qt since the last update: ++ b/WebKit/qt/ChangeLog 2010-01-28 Trond Kjernåsen <trond@trolltech.com> Reviewed by Simon Hausmann. [Qt] Fix for endless print loop when printing web pages * Api/qwebframe.cpp: (QWebFrame::print): 2010-01-26 Simon Hausmann <simon.hausmann@nokia.com> Reviewed by Kenneth Rohde Christiansen. [Qt] Show comboboxes on Maemo 5 https://bugs.webkit.org/show_bug.cgi?id=34088 Don't try to show the combobox by simulating a mouse event from QCursor::pos() to get the combobox position right. The position on Maemo 5 is independent from the mouse and there's no QCursor::pos(). * WebCoreSupport/QtFallbackWebPopup.cpp: (WebCore::QtFallbackWebPopup::show): 2010-01-26 Holger Hans Peter Freyther <zecke@selfish.org> Reviewed by Simon Hausmann. [Qt] JavaScript prompt is currently broken https://bugs.webkit.org/show_bug.cgi?id=30914 In r52152 a patch was landed to convert a null QString to an empty WebCore::String in case the prompt was accepted but the default implementation returned the null QString. The patch tried to avoid assign to result twice and was not checking the QString if it is null but the default value. This lead to always returning an empty string on successful prompts. Fix it by checking the variable 'x' for isNull. The manual test case used didn't cover the case of non empty input, replace it with an automatic test case that should cover all cases. * WebCoreSupport/ChromeClientQt.cpp: (WebCore::ChromeClientQt::runJavaScriptPrompt): Fix the bug. * tests/qwebpage/tst_qwebpage.cpp: Add automatic test case (JSPromptPage::JSPromptPage): (JSPromptPage::javaScriptPrompt): (tst_QWebPage::testJSPrompt): (cherry picked from commit 4919286e4e9de496514f28432a81deb91d530fd1)
Diffstat (limited to 'util/s60pixelmetrics/pm_mapperview.cpp')
0 files changed, 0 insertions, 0 deletions