Fix crash when multiple screens are reported from HAL.

The support for multiple screens is not implemented yet in Qt on the
Symbian platform, so there is really no need to query the HAL for the
value since the additional screens can't be used yet anyway. The crash
here occured when the HAL returned more than 1 screen, but the arrays
were resized to contain one element. The loop in resizeEvent() was
iterating past the end of the array because it thought there were more
screens than the arrays did.

Reviewed-by: axis

1 files changed, 7 insertions, 11 deletions

diff --git a/src/gui/kernel/qdesktopwidget_s60.cpp b/src/gui/kernel/qdesktopwidget_s60.cpp
index 77745ea..84e3c5d 100644
--- a/src/gui/kernel/qdesktopwidget_s60.cpp
+++ b/src/gui/kernel/qdesktopwidget_s60.cpp
@@ -88,24 +88,20 @@ QDesktopWidgetPrivate::~QDesktopWidgetPrivate()
 
 void QDesktopWidgetPrivate::init(QDesktopWidget *that)
 {
-    int screenCount=0;
+//    int screenCount=0;
 
-    if (HAL::Get(0, HALData::EDisplayNumberOfScreens, screenCount) == KErrNone)
-        QDesktopWidgetPrivate::screenCount = screenCount;
-    else
-        QDesktopWidgetPrivate::screenCount = 0;
+    // ### TODO: Implement proper multi-display support
+	QDesktopWidgetPrivate::screenCount = 1;
+//    if (HAL::Get(0, HALData::EDisplayNumberOfScreens, screenCount) == KErrNone)
+//        QDesktopWidgetPrivate::screenCount = screenCount;
+//    else
+//        QDesktopWidgetPrivate::screenCount = 0;
 
     rects = new QVector<QRect>();
     workrects = new QVector<QRect>();
 
     rects->resize(QDesktopWidgetPrivate::screenCount);
     workrects->resize(QDesktopWidgetPrivate::screenCount);
-
-    // ### TODO: Implement proper multi-display support
-    rects->resize(1);
-    rects->replace(0, that->rect());
-    workrects->resize(1);
-    workrects->replace(0, that->rect());
 }
 
 void QDesktopWidgetPrivate::cleanup()