From 3ee48926e6584b4afeda1fc406d19d7b1a8d6f20 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Thu, 29 Nov 2012 14:59:02 +0200 Subject: 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 --- src/gui/kernel/qguiapplication.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; } /*! -- cgit v1.2.3