From 88a04ac016f57c2d78e714682445dff2e7db4ade Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@nokia.com>
Date: Tue, 11 Sep 2012 19:54:20 +0200
Subject: Imported WebKit commit 42d95198c30c2d1a94a5081181aad0b2be7c316c
 (http://svn.webkit.org/repository/webkit/trunk@128206)

This includes the rewrite of the configure part of the build system which should fix the QtQuick2 detection
and allow for further simplifications in the future
---
 Source/WebKit2/UIProcess/qt/WebPopupMenuProxyQt.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'Source/WebKit2/UIProcess/qt/WebPopupMenuProxyQt.cpp')

diff --git a/Source/WebKit2/UIProcess/qt/WebPopupMenuProxyQt.cpp b/Source/WebKit2/UIProcess/qt/WebPopupMenuProxyQt.cpp
index 32ec1857b..128379f26 100644
--- a/Source/WebKit2/UIProcess/qt/WebPopupMenuProxyQt.cpp
+++ b/Source/WebKit2/UIProcess/qt/WebPopupMenuProxyQt.cpp
@@ -55,6 +55,7 @@ public:
     PopupMenuItemModel(const Vector<WebPopupItem>&, bool multiple);
     virtual int rowCount(const QModelIndex& parent = QModelIndex()) const { return m_items.size(); }
     virtual QVariant data(const QModelIndex&, int role = Qt::DisplayRole) const;
+    virtual QHash<int, QByteArray> roleNames() const;
 
     Q_INVOKABLE void select(int);
 
@@ -167,11 +168,15 @@ PopupMenuItemModel::PopupMenuItemModel(const Vector<WebPopupItem>& webPopupItems
     : m_selectedModelIndex(-1)
     , m_allowMultiples(multiple)
 {
-    static QHash<int, QByteArray> roles = createRoleNamesHash();
-    setRoleNames(roles);
     buildItems(webPopupItems);
 }
 
+QHash<int, QByteArray> PopupMenuItemModel::roleNames() const
+{
+    static QHash<int, QByteArray> roles = createRoleNamesHash();
+    return roles;
+}
+
 QVariant PopupMenuItemModel::data(const QModelIndex& index, int role) const
 {
     if (!index.isValid() || index.row() < 0 || index.row() >= m_items.size())
-- 
cgit v1.2.1