Imported WebKit commit 7e538425aa020340619e927792f3d895061fb54b (http://svn.webkit.org/repository/webkit/trunk@116286)

1 files changed, 9 insertions, 7 deletions

diff --git a/Source/WebKit2/UIProcess/qt/WebPopupMenuProxyQt.cpp b/Source/WebKit2/UIProcess/qt/WebPopupMenuProxyQt.cpp
index 4c0deadc2..9f9100a54 100644
--- a/Source/WebKit2/UIProcess/qt/WebPopupMenuProxyQt.cpp
+++ b/Source/WebKit2/UIProcess/qt/WebPopupMenuProxyQt.cpp
@@ -32,8 +32,8 @@
 #include "qquickwebview_p.h"
 #include "qquickwebview_p_p.h"
 #include <QtCore/QAbstractListModel>
-#include <QtDeclarative/QDeclarativeContext>
-#include <QtDeclarative/QDeclarativeEngine>
+#include <QtQml/QQmlContext>
+#include <QtQml/QQmlEngine>
 
 using namespace WebCore;
 
@@ -239,11 +239,13 @@ void WebPopupMenuProxyQt::showPopupMenu(const IntRect& rect, WebCore::TextDirect
         notifyValueChanged();
         return;
     }
+    QQuickWebViewPrivate::get(m_webView)->setDialogActive(true);
 }
 
 void WebPopupMenuProxyQt::hidePopupMenu()
 {
     m_itemSelector.clear();
+    QQuickWebViewPrivate::get(m_webView)->setDialogActive(false);
     m_context.clear();
     notifyValueChanged();
 }
@@ -255,7 +257,7 @@ void WebPopupMenuProxyQt::selectIndex(int index)
 
 void WebPopupMenuProxyQt::createItem(QObject* contextObject)
 {
-    QDeclarativeComponent* component = m_webView->experimental()->itemSelector();
+    QQmlComponent* component = m_webView->experimental()->itemSelector();
     if (!component) {
         delete contextObject;
         return;
@@ -287,12 +289,12 @@ void WebPopupMenuProxyQt::createItem(QObject* contextObject)
     m_itemSelector->setParentItem(m_webView);
 }
 
-void WebPopupMenuProxyQt::createContext(QDeclarativeComponent* component, QObject* contextObject)
+void WebPopupMenuProxyQt::createContext(QQmlComponent* component, QObject* contextObject)
 {
-    QDeclarativeContext* baseContext = component->creationContext();
+    QQmlContext* baseContext = component->creationContext();
     if (!baseContext)
-        baseContext = QDeclarativeEngine::contextForObject(m_webView);
-    m_context = adoptPtr(new QDeclarativeContext(baseContext));
+        baseContext = QQmlEngine::contextForObject(m_webView);
+    m_context = adoptPtr(new QQmlContext(baseContext));
 
     contextObject->setParent(m_context.get());
     m_context->setContextProperty(QLatin1String("model"), contextObject);