diff options
author | Martin Jones <martin.jones@nokia.com> | 2010-08-23 22:30:47 (GMT) |
---|---|---|
committer | Martin Jones <martin.jones@nokia.com> | 2010-08-23 22:30:47 (GMT) |
commit | 2cb91f6371a7918cfe54cc31efe61a39df89ab9e (patch) | |
tree | 07214d0935413dc2f48cf10ee9d56e6b96783ba2 /src | |
parent | 6a3945d3ca3185c00597dcaefb93617620973ff5 (diff) | |
parent | d405aa6510514ce02b312994db55c305bde60285 (diff) | |
download | Qt-2cb91f6371a7918cfe54cc31efe61a39df89ab9e.zip Qt-2cb91f6371a7918cfe54cc31efe61a39df89ab9e.tar.gz Qt-2cb91f6371a7918cfe54cc31efe61a39df89ab9e.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src')
-rw-r--r-- | src/corelib/concurrent/qtconcurrentrun.cpp | 2 | ||||
-rw-r--r-- | src/gui/kernel/qwidget.cpp | 4 | ||||
-rw-r--r-- | src/opengl/qgl.cpp | 5 |
3 files changed, 8 insertions, 3 deletions
diff --git a/src/corelib/concurrent/qtconcurrentrun.cpp b/src/corelib/concurrent/qtconcurrentrun.cpp index 5a9c755..e80a204 100644 --- a/src/corelib/concurrent/qtconcurrentrun.cpp +++ b/src/corelib/concurrent/qtconcurrentrun.cpp @@ -99,7 +99,7 @@ functions; passing by pointer is useful for calling non-const member functions that modify the instance. - For example, calling QString::split() (a const member function) in a + For example, calling QByteArray::split() (a const member function) in a separate thread is done like this: \snippet doc/src/snippets/code/src_corelib_concurrent_qtconcurrentrun.cpp 4 diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp index 8b8641f..3d2bfe2 100644 --- a/src/gui/kernel/qwidget.cpp +++ b/src/gui/kernel/qwidget.cpp @@ -1275,9 +1275,9 @@ 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(q->inherits("QGLWidget")) { + if (isGLWidget) { // Don't waste GPU mem for unnecessary large egl surface - data.crect = parentWidget ? QRect(0,0,2,2) : QRect(0,0,2,2); + data.crect = QRect(0,0,2,2); } else { data.crect = parentWidget ? QRect(0,0,100,30) : QRect(0,0,360,640); } diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index 51187cf..9e69816 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -4445,6 +4445,11 @@ void QGLWidget::glDraw() Q_D(QGLWidget); if (!isValid()) return; +#ifdef Q_OS_SYMBIAN + // Crashes on Symbian if trying to render to invisible surfaces + if (!isVisible() && d->glcx->device()->devType() == QInternal::Widget) + return; +#endif makeCurrent(); #ifndef QT_OPENGL_ES if (d->glcx->deviceIsPixmap()) |