diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-02-11 06:09:18 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-02-11 06:09:18 (GMT) |
| commit | 9a76a90b1944db52bd4180d27c01781fbb3499d4 (patch) | |
| tree | 46ac1557761e30127330520d2fa6412305e07443 /src/gui/kernel/qdesktopwidget_s60.cpp | |
| parent | b5fe99c0105a9791e34a8b959822430497a4aeb9 (diff) | |
| parent | b9907e309885b4b8ce280c721231a56a583b51d0 (diff) | |
| download | Qt-9a76a90b1944db52bd4180d27c01781fbb3499d4.zip Qt-9a76a90b1944db52bd4180d27c01781fbb3499d4.tar.gz Qt-9a76a90b1944db52bd4180d27c01781fbb3499d4.tar.bz2 | |
Merge remote branch 'origin/4.6' into bearermanagement/integration
Conflicts:
src/s60installs/s60installs.pro
Diffstat (limited to 'src/gui/kernel/qdesktopwidget_s60.cpp')
| -rw-r--r-- | src/gui/kernel/qdesktopwidget_s60.cpp | 18 |
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() |