From 5440d903532a37fdd69ae60e6579f82909996620 Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Wed, 9 Mar 2011 14:26:16 +0200 Subject: Added missing ifdefs to allow compilation on older Symbian versions. Reviewed-by: TRUSTME --- src/gui/kernel/qapplication_s60.cpp | 2 ++ src/gui/kernel/qdesktopwidget_s60.cpp | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp index 86d4fcf..6e43c8b 100644 --- a/src/gui/kernel/qapplication_s60.cpp +++ b/src/gui/kernel/qapplication_s60.cpp @@ -2055,7 +2055,9 @@ int QApplicationPrivate::symbianProcessWsEvent(const QSymbianEvent *symbianEvent } break; case EEventScreenDeviceChanged: // fallthrough +#if defined(Q_SYMBIAN_SUPPORTS_MULTIPLE_SCREENS) case EEventDisplayChanged: +#endif if (callSymbianEventFilters(symbianEvent)) return 1; if (S60) diff --git a/src/gui/kernel/qdesktopwidget_s60.cpp b/src/gui/kernel/qdesktopwidget_s60.cpp index 9d48b64..c3963f4 100644 --- a/src/gui/kernel/qdesktopwidget_s60.cpp +++ b/src/gui/kernel/qdesktopwidget_s60.cpp @@ -129,10 +129,12 @@ void QDesktopWidgetPrivate::init(QDesktopWidget *that) // valid or not. screenCount = S60->screenCount(); +#if defined(Q_SYMBIAN_SUPPORTS_MULTIPLE_SCREENS) if (displayControl) { if (displayControl->NumberOfResolutions() < 1) screenCount = 1; } +#endif if (screenCount < 1) { qWarning("No screen available"); screenCount = 1; @@ -147,7 +149,7 @@ void QDesktopWidgetPrivate::init(QDesktopWidget *that) screens->resize(screenCount); for (int i = 0; i < screenCount; ++i) { - // All screens will share the same geometry as there is no true virtual desktop + // All screens will have a position of (0, 0) as there is no true virtual desktop // or pointer event support for multiple screens on Symbian. QRect r(0, 0, S60->screenWidthInPixelsForScreen[i], S60->screenHeightInPixelsForScreen[i]); -- cgit v0.12