diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-07 12:14:05 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-07 12:14:05 (GMT) |
| commit | e50340bdaa8e331f9b3e2bfc36abc1b8bc1a1c7a (patch) | |
| tree | a95eb0e97533354ed4265c24f82a58fb40af0e02 | |
| parent | 479f1e8e36f57bfd3617c6fcd068ae66849d355e (diff) | |
| parent | 27f0f0d674cb3f3408eb3817c32abd67560eb48b (diff) | |
| download | Qt-e50340bdaa8e331f9b3e2bfc36abc1b8bc1a1c7a.zip Qt-e50340bdaa8e331f9b3e2bfc36abc1b8bc1a1c7a.tar.gz Qt-e50340bdaa8e331f9b3e2bfc36abc1b8bc1a1c7a.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
Remove workaround and fix properly
| -rw-r--r-- | src/gui/styles/qs60style_s60.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/gui/styles/qs60style_s60.cpp b/src/gui/styles/qs60style_s60.cpp index 6a7158c..6b79874 100644 --- a/src/gui/styles/qs60style_s60.cpp +++ b/src/gui/styles/qs60style_s60.cpp @@ -776,16 +776,8 @@ QPoint qt_s60_fill_background_offset(const QWidget *targetWidget) { CCoeControl *control = targetWidget->effectiveWinId(); TPoint pos(0,0); - if (control) { - // FIXME properly: S60 3.1 has a bug that CCoeControl::PositionRelativeToScreen sometimes - // freezes the device, possibly in cases where we run out of memory. - // We use CCoeControl::Position instead in S60 3.1, which returns same values - // in most cases. - if (QSysInfo::s60Version() == QSysInfo::SV_S60_3_1) - pos = control->Position(); - else - pos = control->PositionRelativeToScreen(); - } + if (control) + pos = control->PositionRelativeToScreen(); return QPoint(pos.iX, pos.iY); } |