diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-07-24 17:03:20 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-07-24 17:03:20 +0200 |
| commit | 08d4a74d56ca431877819fc4566e27eafe150342 (patch) | |
| tree | ebd8530838ab390c015c6b7e659a22852c1663ae /Source/WebKit/qt/Api/qwebpage.cpp | |
| parent | 1de6cd4794bbd5a52189384189a2b8df1848b39b (diff) | |
| download | qtwebkit-08d4a74d56ca431877819fc4566e27eafe150342.tar.gz | |
Imported WebKit commit 0fbd41c4e13f5a190faf160bf993eee614e6e18e (http://svn.webkit.org/repository/webkit/trunk@123477)
New snapshot that adapts to latest Qt API changes
Diffstat (limited to 'Source/WebKit/qt/Api/qwebpage.cpp')
| -rw-r--r-- | Source/WebKit/qt/Api/qwebpage.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/Source/WebKit/qt/Api/qwebpage.cpp b/Source/WebKit/qt/Api/qwebpage.cpp index 1330870da..8e9633d18 100644 --- a/Source/WebKit/qt/Api/qwebpage.cpp +++ b/Source/WebKit/qt/Api/qwebpage.cpp @@ -122,6 +122,7 @@ #include <QApplication> #include <QBasicTimer> #include <QBitArray> +#include <QColorDialog> #include <QDebug> #include <QDesktopWidget> #include <QDragEnterEvent> @@ -2443,6 +2444,19 @@ void QWebPage::triggerAction(WebAction action, bool) editor->command(command).execute(); } + +QColor QWebPagePrivate::colorSelectionRequested(const QColor &selectedColor) +{ + QColor ret = selectedColor; +#ifndef QT_NO_COLORDIALOG + QWidget* parent = (client) ? client->ownerWidget() : 0; + ret = QColorDialog::getColor(selectedColor, parent); + if (!ret.isValid()) + ret = selectedColor; +#endif + return ret; +} + QSize QWebPage::viewportSize() const { if (d->mainFrame && d->mainFrame.data()->d->frame->view()) |