summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTasuku Suzuki <stasuku@gmail.com>2015-03-12 02:23:53 +0900
committerTasuku Suzuki <stasuku@gmail.com>2015-03-13 14:42:13 +0000
commitf901b75926127ff2ded6365e113b0cf17df22183 (patch)
tree8100fe18ed3d5445e54846535ea219531ea985d7 /src
parentd0d107ffc88c5a4be34355e8bd32fe3d9826445a (diff)
Fix crash in QDesktopServices::openUrl() without QGuiApplication
Change-Id: Ib1a66c71725dac8fd7ba7ef3d432667b210df778 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Diffstat (limited to 'src')
-rw-r--r--src/gui/util/qdesktopservices.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/gui/util/qdesktopservices.cpp b/src/gui/util/qdesktopservices.cpp
index 60f9096a77..cf1096a251 100644
--- a/src/gui/util/qdesktopservices.cpp
+++ b/src/gui/util/qdesktopservices.cpp
@@ -185,7 +185,12 @@ bool QDesktopServices::openUrl(const QUrl &url)
}
if (!url.isValid())
return false;
- QPlatformServices *platformServices = QGuiApplicationPrivate::platformIntegration()->services();
+
+ QPlatformIntegration *platformIntegration = QGuiApplicationPrivate::platformIntegration();
+ if (!platformIntegration)
+ return false;
+
+ QPlatformServices *platformServices = platformIntegration->services();
if (!platformServices) {
qWarning("%s: The platform plugin does not support services.", Q_FUNC_INFO);
return false;