diff options
| author | Sami Merila <sami.merila@nokia.com> | 2011-03-15 11:47:02 (GMT) |
|---|---|---|
| committer | Sami Merila <sami.merila@nokia.com> | 2011-03-15 11:47:02 (GMT) |
| commit | 977d578368f62c2630766ca0f69fc3f26839c4c0 (patch) | |
| tree | e1143a8f9250cdcd7814fca3e6f0b49a23bd0136 /src/gui | |
| parent | 7dfa50a9b97d28813341329a55aa1a4b5a7de527 (diff) | |
| parent | f9a297d9b2331adab2116210d3c527fae22e336e (diff) | |
| download | Qt-977d578368f62c2630766ca0f69fc3f26839c4c0.zip Qt-977d578368f62c2630766ca0f69fc3f26839c4c0.tar.gz Qt-977d578368f62c2630766ca0f69fc3f26839c4c0.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/kernel/qdesktopwidget_s60.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/gui/kernel/qdesktopwidget_s60.cpp b/src/gui/kernel/qdesktopwidget_s60.cpp index c3963f4..62a4d40 100644 --- a/src/gui/kernel/qdesktopwidget_s60.cpp +++ b/src/gui/kernel/qdesktopwidget_s60.cpp @@ -188,12 +188,14 @@ void QDesktopWidgetPrivate::cleanup() void QDesktopWidgetPrivate::init_sys() { #if defined(Q_SYMBIAN_SUPPORTS_MULTIPLE_SCREENS) - CWsScreenDevice *dev = S60->screenDevice(1); - if (dev) { - displayControl = static_cast<MDisplayControl *>( - dev->GetInterface(MDisplayControl::ETypeId)); - if (displayControl) { - displayControl->EnableDisplayChangeEvents(ETrue); + if (S60->screenCount() > 1) { + CWsScreenDevice *dev = S60->screenDevice(1); + if (dev) { + displayControl = static_cast<MDisplayControl *>( + dev->GetInterface(MDisplayControl::ETypeId)); + if (displayControl) { + displayControl->EnableDisplayChangeEvents(ETrue); + } } } #endif |