diff options
| author | Daniel d'Andrada <daniel.dandrada@nokia.com> | 2010-09-15 15:01:23 +0300 |
|---|---|---|
| committer | Daniel d'Andrada <daniel.dandrada@nokia.com> | 2010-09-15 15:01:23 +0300 |
| commit | 92706b5b811e2bc759cc835c9ea1c3dcd9d7a64d (patch) | |
| tree | c9db6ec1aa53510f6c8c5455019bf041de561032 /src | |
| parent | c3abcf4e8db8fa7d64b29d7a13d6889f351d78df (diff) | |
Revert "Fixes: NB#191067 - MButton: Unable to disable the icon."
This reverts commit d9f0d764ecca60d3f000b23cc9c096a139f2fcaa.
It introduced some bad visual glitches.
Diffstat (limited to 'src')
| -rw-r--r-- | src/views/mbuttonview.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/views/mbuttonview.cpp b/src/views/mbuttonview.cpp index 065a2939..cf35c229 100644 --- a/src/views/mbuttonview.cpp +++ b/src/views/mbuttonview.cpp @@ -276,7 +276,6 @@ void MButtonViewPrivate::updateIcon(Icon **iconPtr, 1 - MButtonModel::icon(), a QIcon 2 - MButtonModel::[toggled]iconID(), a QString 3 - MButtonStyle::[toggled]iconId(), a QString - 4 - No icon at all */ /* @@ -319,10 +318,6 @@ void MButtonViewPrivate::updateIcon(Icon **iconPtr, icon->origin = IconOriginFromStyleIconId; icon->id = iconIdFromStyle; icon->theme = MTheme::currentTheme(); - } else { - delete icon; - icon = NULL; - *iconPtr = icon; } } |