diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2012-11-29 14:59:02 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-30 08:23:11 +0100 |
| commit | 3ee48926e6584b4afeda1fc406d19d7b1a8d6f20 (patch) | |
| tree | ae987e8cd46b10ba0156c45046701b6f55151aa1 | |
| parent | d31dbe1efe0dd9d2d9d85f9c3c30777c8c5401bf (diff) | |
Fix crash when requesting QGuiApplication::platformNativeInterface()
If QGuiApplication has not been instantiated, this function would
crash. Change it to return NULL pointer instead.
Change-Id: Ia3d27019daa436d5243c9cce757a132d96aae112
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| -rw-r--r-- | src/gui/kernel/qguiapplication.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index e6aece0ad9..80e13227ee 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -1128,7 +1128,7 @@ Qt::MouseButtons QGuiApplication::mouseButtons() QPlatformNativeInterface *QGuiApplication::platformNativeInterface() { QPlatformIntegration *pi = QGuiApplicationPrivate::platformIntegration(); - return pi->nativeInterface(); + return pi ? pi->nativeInterface() : 0; } /*! |