diff options
author | Steve Block <steveblock@google.com> | 2010-02-05 14:27:46 +0000 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2010-02-15 10:49:50 +0000 |
commit | 5e2bc6953fe6923165b8a5d7679939693a1d58d6 (patch) | |
tree | 6ccb8c24bc2bf5e8f413e6cfae250b729b426631 /WebKit/qt/WebCoreSupport | |
parent | 4a00f4fccc3cb7e9996749a05631f5d7b9de756e (diff) | |
download | external_webkit-5e2bc6953fe6923165b8a5d7679939693a1d58d6.zip external_webkit-5e2bc6953fe6923165b8a5d7679939693a1d58d6.tar.gz external_webkit-5e2bc6953fe6923165b8a5d7679939693a1d58d6.tar.bz2 |
Merge webkit.org at r54340 : Initial merge by git
Change-Id: Ib489d2ff91186ea3652522e1d586e54416a2cf44
Diffstat (limited to 'WebKit/qt/WebCoreSupport')
-rw-r--r-- | WebKit/qt/WebCoreSupport/InspectorClientQt.cpp | 3 | ||||
-rw-r--r-- | WebKit/qt/WebCoreSupport/QtFallbackWebPopup.cpp | 18 |
2 files changed, 12 insertions, 9 deletions
diff --git a/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp b/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp index 1caf96d..4927ea8 100644 --- a/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp +++ b/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp @@ -58,9 +58,8 @@ class InspectorClientWebPage : public QWebPage { friend class InspectorClientQt; public: InspectorClientWebPage(QObject* parent = 0) - : QWebPage(parent) + : QWebPage(parent) { - settings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, false); } QWebPage* createWindow(QWebPage::WebWindowType) diff --git a/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.cpp b/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.cpp index 7ee2b7c..c553c45 100644 --- a/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.cpp +++ b/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.cpp @@ -95,6 +95,15 @@ void QtFallbackWebPopup::show() { populate(); m_combo->setCurrentIndex(currentIndex()); + +#if defined(Q_WS_MAEMO_5) + // Comboboxes with Qt on Maemo 5 come up in their full width on the screen, so neither + // the proxy widget, nor the coordinates are needed. + m_combo->setParent(pageClient()->ownerWidget()); + m_combo->showPopup(); + return; +#endif + QRect rect = geometry(); if (QGraphicsWebView *webView = qobject_cast<QGraphicsWebView*>(pageClient()->pluginParent())) { if (!m_proxy) { @@ -110,16 +119,11 @@ void QtFallbackWebPopup::show() } - // QCursor::pos() is not a great idea for a touch screen, but we don't need the coordinates - // as comboboxes with Qt on Maemo 5 come up in their full width on the screen. - // On the other platforms it's okay to use QCursor::pos(). -#if defined(Q_WS_MAEMO_5) - m_combo->showPopup(); -#else + // QCursor::pos() is not a great idea for a touch screen, but as Maemo 5 is handled + // separately above, this should be okay. QMouseEvent event(QEvent::MouseButtonPress, QCursor::pos(), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); QCoreApplication::sendEvent(m_combo, &event); -#endif } void QtFallbackWebPopup::hide() |