summaryrefslogtreecommitdiffstats
path: root/WebCore/platform/qt/QWebPopup.cpp
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2008-12-17 18:05:15 -0800
committerThe Android Open Source Project <initial-contribution@android.com>2008-12-17 18:05:15 -0800
commit1cbdecfa9fc428ac2d8aca0fa91c9580b3d57353 (patch)
tree4457a7306ea5acb43fe05bfe0973b1f7faf97ba2 /WebCore/platform/qt/QWebPopup.cpp
parent9364f22aed35e1a1e9d07c121510f80be3ab0502 (diff)
downloadexternal_webkit-1cbdecfa9fc428ac2d8aca0fa91c9580b3d57353.zip
external_webkit-1cbdecfa9fc428ac2d8aca0fa91c9580b3d57353.tar.gz
external_webkit-1cbdecfa9fc428ac2d8aca0fa91c9580b3d57353.tar.bz2
Code drop from //branches/cupcake/...@124589
Diffstat (limited to 'WebCore/platform/qt/QWebPopup.cpp')
-rw-r--r--WebCore/platform/qt/QWebPopup.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/WebCore/platform/qt/QWebPopup.cpp b/WebCore/platform/qt/QWebPopup.cpp
index dfc430f..ae5c24e 100644
--- a/WebCore/platform/qt/QWebPopup.cpp
+++ b/WebCore/platform/qt/QWebPopup.cpp
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2007 Trolltech ASA
+ * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -20,7 +20,7 @@
*/
#include "config.h"
#include "QWebPopup.h"
-#include "RenderStyle.h"
+#include "PopupMenuStyle.h"
#include <QCoreApplication>
#include <QMouseEvent>
@@ -33,7 +33,7 @@ QWebPopup::QWebPopup(PopupMenuClient* client)
{
Q_ASSERT(m_client);
- setFont(m_client->clientStyle()->font().font());
+ setFont(m_client->menuStyle().font().font());
connect(this, SIGNAL(activated(int)),
SLOT(activeChanged(int)));
}