diff options
| author | axis <qt-info@nokia.com> | 2009-09-03 14:43:44 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-09-03 14:43:44 (GMT) |
| commit | 0adfe49f2deb1d6995753a23405317f91b487c51 (patch) | |
| tree | 8bfcfca6e8a429a9690b704c4ba2456f6ac8645a /src/gui/kernel/qwidget_s60.cpp | |
| parent | f360180890298618ef3284c08789c2a243e1ba9d (diff) | |
| parent | c13b97f2f24d2ff2e62bedead5e3d50f8b992c1a (diff) | |
| download | Qt-0adfe49f2deb1d6995753a23405317f91b487c51.zip Qt-0adfe49f2deb1d6995753a23405317f91b487c51.tar.gz Qt-0adfe49f2deb1d6995753a23405317f91b487c51.tar.bz2 | |
Merge branch 'minimizeWrapperApp' into 4.6
Diffstat (limited to 'src/gui/kernel/qwidget_s60.cpp')
| -rw-r--r-- | src/gui/kernel/qwidget_s60.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/kernel/qwidget_s60.cpp b/src/gui/kernel/qwidget_s60.cpp index 6da35d8..d630143 100644 --- a/src/gui/kernel/qwidget_s60.cpp +++ b/src/gui/kernel/qwidget_s60.cpp @@ -722,7 +722,9 @@ void QWidgetPrivate::setWindowIcon_sys(bool forceReset) // The API to get title_pane graphics size is not public -> assume square space based // on titlebar font height. CAknBitmap would be optimum, wihtout setting the size, since // then title pane would automatically scale the bitmap. Unfortunately it is not public API - const CFont * font = AknLayoutUtils::FontFromId(EAknLogicalFontTitleFont); + // Also this function is leaving, although it is not named as such. + const CFont * font; + QT_TRAP_THROWING(font = AknLayoutUtils::FontFromId(EAknLogicalFontTitleFont)); TSize iconSize(font->HeightInPixels(), font->HeightInPixels()); QIcon icon = q->windowIcon(); |