From c97e91098df1a3a4874ea9acdc968690e6b59986 Mon Sep 17 00:00:00 2001
From: Caroline Chao <caroline.chao@digia.com>
Date: Fri, 3 May 2013 12:32:50 +0200
Subject: [PATCH] Fix warning in qquickmenu_p.h
'Warning: Property declaration __font has no READ accessor function or
associated MEMBER variable. The property will be invalid.'
Task-number: QTBUG-30988
Change-Id: I7530310d0da03ecd59bfe1cc3e221e776c17d4f7
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
---
src/controls/qquickmenu.cpp | 6 ++++++
src/controls/qquickmenu_p.h | 5 ++++-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/src/controls/qquickmenu.cpp b/src/controls/qquickmenu.cpp
index 088e6ad5a..efc49cd64 100644
--- a/src/controls/qquickmenu.cpp
+++ b/src/controls/qquickmenu.cpp
@@ -255,6 +255,8 @@ QQuickMenu::QQuickMenu(QObject *parent)
if (platformItem())
platformItem()->setMenu(m_platformMenu);
}
+ if (const QFont *font = QGuiApplicationPrivate::platformTheme()->font(QPlatformTheme::MenuItemFont))
+ m_font = *const_cast<QFont*>(font);
}
QQuickMenu::~QQuickMenu()
@@ -288,6 +290,10 @@ void QQuickMenu::setMinimumWidth(int w)
void QQuickMenu::setFont(const QFont &arg)
{
+ if (arg == m_font)
+ return;
+
+ m_font = arg;
if (m_platformMenu)
m_platformMenu->setFont(arg);
}
diff --git a/src/controls/qquickmenu_p.h b/src/controls/qquickmenu_p.h
index d57de1266..6207e3e0f 100644
--- a/src/controls/qquickmenu_p.h
+++ b/src/controls/qquickmenu_p.h
@@ -48,6 +48,7 @@
#include <QtCore/qvariant.h>
#include <QtQml/qqml.h>
#include <QtQml/qqmllist.h>
+#include <QtGui/QFont>
QT_BEGIN_NAMESPACE
@@ -69,7 +70,7 @@ class QQuickMenu : public QQuickMenuText
Q_PROPERTY(bool __popupVisible READ popupVisible NOTIFY popupVisibleChanged)
Q_PROPERTY(QQuickItem *__contentItem READ menuContentItem WRITE setMenuContentItem)
Q_PROPERTY(int __minimumWidth READ minimumWidth WRITE setMinimumWidth)
- Q_PROPERTY(QFont __font WRITE setFont)
+ Q_PROPERTY(QFont __font READ font WRITE setFont)
Q_PROPERTY(qreal __xOffset READ xOffset WRITE setXOffset)
Q_PROPERTY(qreal __yOffset READ yOffset WRITE setYOffset)
@@ -116,6 +117,7 @@ public:
void setMinimumWidth(int w);
void setFont(const QFont &font);
+ QFont font() const { return m_font; }
qreal xOffset() const { return m_xOffset; }
void setXOffset(qreal);
@@ -171,6 +173,7 @@ private:
int m_containersCount;
qreal m_xOffset;
qreal m_yOffset;
+ QFont m_font;
};
QT_END_NAMESPACE
--
GitLab