summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorCaroline Chao <caroline.chao@digia.com>2013-05-03 10:27:58 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-05-03 12:15:18 +0200
commita0173a8b3b972ecf098515cda58b9c6d6f9486eb (patch)
treef162ba4ec1c01e7b44ca264aefed4aeab6158704 /src
parent0cde4af617cf293c17428673cd28774513cd4615 (diff)
Fix warning unused variable 'menu'
"warning: unused variable 'menu' [-Wunused-variable]" Change-Id: Ie7cab810475a575f9ffa375380cf62d67c0bc836 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/private/qquickstyleitem.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/private/qquickstyleitem.cpp b/src/private/qquickstyleitem.cpp
index f308e494d..59c9eaac1 100644
--- a/src/private/qquickstyleitem.cpp
+++ b/src/private/qquickstyleitem.cpp
@@ -199,7 +199,8 @@ void QQuickStyleItem::initStyleOption()
const QFont *font = QGuiApplicationPrivate::platformTheme()->font(platformFont);
if (font)
opt->fontMetrics = QFontMetrics(*font);
- if (QObject * menu = m_properties["menu"].value<QObject *>()) {
+ QObject * menu = m_properties["menu"].value<QObject *>();
+ if (menu) {
opt->features |= QStyleOptionButton::HasMenu;
#ifdef Q_OS_MAC
if (style() == "mac") {