diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-10-19 10:29:01 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-19 12:24:49 +0200 |
| commit | 6c4aa14ecc6a1be7ea27dadda9e289c27c37f9b9 (patch) | |
| tree | cf99d7e887cea1534eaf89ac51a76d4c01c06c49 /src/widgets/kernel/qwidget.cpp | |
| parent | 19c322b0896e3549934d7297aa0a7fe32beac8b6 (diff) | |
Widgets: Fix a startup crash in QSplashScreen (Linguist).
Change-Id: I38f5920fb62277f97e9b3b45651527c2475556ac
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'src/widgets/kernel/qwidget.cpp')
| -rw-r--r-- | src/widgets/kernel/qwidget.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index de4ae0a5d3..8e3fd48546 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -1180,8 +1180,9 @@ void QWidgetPrivate::init(QWidget *parentWidget, Qt::WindowFlags f) } #elif defined(Q_WS_QPA) if (desktopWidget) { - int screen = desktopWidget->d_func()->topData()->screenIndex; - q->windowHandle()->setScreen(QGuiApplication::screens().value(screen, 0)); + const int screen = desktopWidget->d_func()->topData()->screenIndex; + if (QWindow *window = q->windowHandle()) + window->setScreen(QGuiApplication::screens().value(screen, 0)); } #else Q_UNUSED(desktopWidget); |