summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/android
diff options
context:
space:
mode:
authorAndy Shaw <andy.shaw@digia.com>2014-09-18 20:49:41 +0200
committerRichard Moe Gustavsen <richard.gustavsen@digia.com>2014-09-20 18:23:35 +0200
commitb53f6fdd313f71f05b99093966736a8f7442ded8 (patch)
tree3c71f6f7b3b516595dac3ba20a9fb3b54ae676c2 /src/plugins/platforms/android
parent4d8dd7f673d874607eb23c0dc36bb7c24324aa4f (diff)
Respect the PM_SmallIconSize setting for icons in a menu on OS X
When a platform menu is used then it would hard code the icon size to 16x16. Instead of using the hard coded value then PM_SmallIconSize should be used instead. Change-Id: I27540ebc4397501e8f57686a118c28cd7167c0a1 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Diffstat (limited to 'src/plugins/platforms/android')
-rw-r--r--src/plugins/platforms/android/qandroidplatformmenuitem.cpp5
-rw-r--r--src/plugins/platforms/android/qandroidplatformmenuitem.h2
2 files changed, 7 insertions, 0 deletions
diff --git a/src/plugins/platforms/android/qandroidplatformmenuitem.cpp b/src/plugins/platforms/android/qandroidplatformmenuitem.cpp
index 4e19ec2939..e510327ba5 100644
--- a/src/plugins/platforms/android/qandroidplatformmenuitem.cpp
+++ b/src/plugins/platforms/android/qandroidplatformmenuitem.cpp
@@ -181,4 +181,9 @@ bool QAndroidPlatformMenuItem::isEnabled() const
return m_isEnabled;
}
+void QAndroidPlatformMenuItem::setIconSize(int size)
+{
+ Q_UNUSED(size)
+}
+
QT_END_NAMESPACE
diff --git a/src/plugins/platforms/android/qandroidplatformmenuitem.h b/src/plugins/platforms/android/qandroidplatformmenuitem.h
index 40c3ab2761..32aeca105b 100644
--- a/src/plugins/platforms/android/qandroidplatformmenuitem.h
+++ b/src/plugins/platforms/android/qandroidplatformmenuitem.h
@@ -85,6 +85,8 @@ public:
void setEnabled(bool enabled);
bool isEnabled() const;
+ void setIconSize(int size);
+
private:
quintptr m_tag;
QString m_text;