diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-03-23 11:08:14 (GMT) |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-03-23 11:08:14 (GMT) |
commit | ebaeb25bebdd29651f15b6e53119597633ea854f (patch) | |
tree | 41374a97b1feec7b92721f3bc6c6c551125ebfa5 /src/3rdparty/webkit/WebKit/qt/tests | |
parent | e5fcad302d86d316390c6b0f62759a067313e8a9 (diff) | |
download | Qt-ebaeb25bebdd29651f15b6e53119597633ea854f.zip Qt-ebaeb25bebdd29651f15b6e53119597633ea854f.tar.gz Qt-ebaeb25bebdd29651f15b6e53119597633ea854f.tar.bz2 |
Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( 70604503a0365edaeff82ffad7b71f90641fa592 )
Changes in WebKit since the last update:
++ b/WebKit/qt/ChangeLog
2009-03-20 Erik L. Bunce <elbunce@xendom.com>
Reviewed by Tor Arne Vestbø.
Fix QWebPage::WebActions action states to more closely match when they are
actually applicable and remove erroneous documentation.
* Most WebActions implemented using editor commands now use the
Editor::Command::isEnabled() to control their availability.
* SelectAll is always enabled (since it's editor command is).
* SetTextDirection{} family of WebActions are available when canEdit() is true
and not just canEditRichly().
Fix and clarify documentation about the availability of various web actions.
* Api/qwebpage.cpp:
(QWebPagePrivate::updateAction):
(QWebPagePrivate::updateEditorActions):
* tests/qwebpage/tst_qwebpage.cpp:
(tst_QWebPage::textSelection):
Diffstat (limited to 'src/3rdparty/webkit/WebKit/qt/tests')
-rw-r--r-- | src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
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 dea9562..54d342e 100644 --- a/src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp +++ b/src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp @@ -894,7 +894,6 @@ void tst_QWebPage::textSelection() QVERIFY(page->action(QWebPage::SelectEndOfDocument) != 0); // right now they are disabled because contentEditable is false - QCOMPARE(page->action(QWebPage::SelectAll)->isEnabled(), false); QCOMPARE(page->action(QWebPage::SelectNextChar)->isEnabled(), false); QCOMPARE(page->action(QWebPage::SelectPreviousChar)->isEnabled(), false); QCOMPARE(page->action(QWebPage::SelectNextWord)->isEnabled(), false); @@ -908,6 +907,9 @@ void tst_QWebPage::textSelection() QCOMPARE(page->action(QWebPage::SelectStartOfDocument)->isEnabled(), false); QCOMPARE(page->action(QWebPage::SelectEndOfDocument)->isEnabled(), false); + // ..but SelectAll is awalys enabled + QCOMPARE(page->action(QWebPage::SelectAll)->isEnabled(), true); + // make it editable before navigating the cursor page->setContentEditable(true); |