diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-24 07:04:11 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-24 07:04:11 (GMT) |
| commit | 77ffaaac7efe39e4b0f7ea24c73d157ffea88440 (patch) | |
| tree | a1f55cab7ac3bfeab31c9b94998286045b259be4 /src/gui/kernel/qwidget.cpp | |
| parent | 2e2ce693e16899dcfd1f39374a78bf2ca3a0e016 (diff) | |
| parent | 00cc8399c7cb2b68d8dbde7b4b33bac24d72a282 (diff) | |
| download | Qt-77ffaaac7efe39e4b0f7ea24c73d157ffea88440.zip Qt-77ffaaac7efe39e4b0f7ea24c73d157ffea88440.tar.gz Qt-77ffaaac7efe39e4b0f7ea24c73d157ffea88440.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Enable QTouchEvent for S60 5.0
Add missing license header.
Fix build error on S60 3.1 environments
QRuntimeGraphicsSystem
Fix replacement functions in platform_paths.prf
Diffstat (limited to 'src/gui/kernel/qwidget.cpp')
| -rw-r--r-- | src/gui/kernel/qwidget.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp index 1f2cd8c..e56ba7b 100644 --- a/src/gui/kernel/qwidget.cpp +++ b/src/gui/kernel/qwidget.cpp @@ -248,9 +248,14 @@ QWidgetPrivate::~QWidgetPrivate() QWindowSurface *QWidgetPrivate::createDefaultWindowSurface() { Q_Q(QWidget); + + QWindowSurface *surface; if (QApplicationPrivate::graphicsSystem()) - return QApplicationPrivate::graphicsSystem()->createWindowSurface(q); - return createDefaultWindowSurface_sys(); + surface = QApplicationPrivate::graphicsSystem()->createWindowSurface(q); + else + surface = createDefaultWindowSurface_sys(); + + return surface; } /*! |