
Untitled
By: a guest on
Jun 2nd, 2012 | syntax:
None | size: 1.54 KB | hits: 10 | expires: Never
diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index d6750be..a9761bf 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,5 +1,15 @@
2011-11-18 Simon Hausmann <simon.hausmann@nokia.com>
+ [Qt][WK2] Fix popups for select elements.
+
+ Reviewed by NOBODY (OOPS!).
+
+ * UIProcess/qt/QtWebPageProxy.cpp:
+ (QtWebPageProxy::createPopupMenuProxy): Fall back to the "desktop" implementation
+ for the moment. Better than nothing :)
+
+2011-11-18 Simon Hausmann <simon.hausmann@nokia.com>
+
[Qt] Removal of QtViewInterface part 3
Reviewed by Kenneth Rohde Christiansen.
diff --git a/Source/WebKit2/UIProcess/qt/QtWebPageProxy.cpp b/Source/WebKit2/UIProcess/qt/QtWebPageProxy.cpp
index b9625b0..a9e407c 100644
--- a/Source/WebKit2/UIProcess/qt/QtWebPageProxy.cpp
+++ b/Source/WebKit2/UIProcess/qt/QtWebPageProxy.cpp
@@ -52,7 +52,7 @@
#include "WebContextMenuProxyQt.h"
#include "WebEditCommandProxy.h"
#include "WebEventFactoryQt.h"
-#include "WebPopupMenuProxyQt.h"
+#include "WebPopupMenuProxyQtDesktop.h"
#include "WKStringQt.h"
#include "WKURLQt.h"
#include <QDrag>
@@ -600,7 +600,7 @@ void QtWebPageProxy::doneWithKeyEvent(const NativeWebKeyboardEvent&, bool)
PassRefPtr<WebPopupMenuProxy> QtWebPageProxy::createPopupMenuProxy(WebPageProxy*)
{
- return WebPopupMenuProxyQt::create();
+ return WebPopupMenuProxyQtDesktop::create(m_webPageProxy.get(), m_qmlWebView);
}
PassRefPtr<WebContextMenuProxy> QtWebPageProxy::createContextMenuProxy(WebPageProxy*)