diff options
| author | Martin Smith <martin.smith@nokia.com> | 2011-03-24 08:55:07 (GMT) |
|---|---|---|
| committer | Martin Smith <martin.smith@nokia.com> | 2011-03-24 08:55:07 (GMT) |
| commit | 7cdc69ee359b41c7e8986dc588b5acf966df2a81 (patch) | |
| tree | 12150964f75badeda928160d700ce1342a7de559 /src/gui/kernel/qwidget.cpp | |
| parent | 1532f7d5dc0c2aab0ab2b62344b398f7fb11de7e (diff) | |
| parent | 98d65b5967d5f8a1648d73185986fabab97e692b (diff) | |
| download | Qt-7cdc69ee359b41c7e8986dc588b5acf966df2a81.zip Qt-7cdc69ee359b41c7e8986dc588b5acf966df2a81.tar.gz Qt-7cdc69ee359b41c7e8986dc588b5acf966df2a81.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'src/gui/kernel/qwidget.cpp')
| -rw-r--r-- | src/gui/kernel/qwidget.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp index 38416a7..18255a1 100644 --- a/src/gui/kernel/qwidget.cpp +++ b/src/gui/kernel/qwidget.cpp @@ -304,6 +304,8 @@ QWidgetPrivate::QWidgetPrivate(int version) , hasAlienChildren(0) , window_event(0) , qd_hd(0) +#elif defined(Q_OS_SYMBIAN) + , symbianScreenNumber(0) #endif { if (!qApp) { @@ -1283,6 +1285,10 @@ void QWidgetPrivate::init(QWidget *parentWidget, Qt::WindowFlags f) // programmer specified desktop widget xinfo = desktopWidget->d_func()->xinfo; } +#elif defined(Q_OS_SYMBIAN) + if (desktopWidget) { + symbianScreenNumber = qt_widget_private(desktopWidget)->symbianScreenNumber; + } #else Q_UNUSED(desktopWidget); #endif @@ -1319,8 +1325,8 @@ void QWidgetPrivate::init(QWidget *parentWidget, Qt::WindowFlags f) //give potential windows a bigger "pre-initial" size; create_sys() will give them a new size later #ifdef Q_OS_SYMBIAN if (isGLWidget) { - // Don't waste GPU mem for unnecessary large egl surface - data.crect = QRect(0,0,2,2); + // Don't waste GPU mem for unnecessary large egl surface until resized by application + data.crect = QRect(0,0,1,1); } else { data.crect = parentWidget ? QRect(0,0,100,30) : QRect(0,0,360,640); } |