diff options
| author | Taylor Braun-Jones <taylor.braun-jones@ge.com> | 2014-07-31 19:47:04 -0400 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@digia.com> | 2014-08-06 11:01:30 +0200 |
| commit | 8076b428d2e6b8de8bacf556b8dccb5bbd99e0ac (patch) | |
| tree | 06a8add58b598e4b0a07706f3d1d93f67136aec6 /src/quick/items/qquickimagebase.cpp | |
| parent | 5a74e882e9d26136caedba1f772a3c5c96e50247 (diff) | |
Don't try to reload QQuick images when changing to null screen
When a QGuiApplication is destructing, a screen change occurs causing
QQuickImageBase to reload images ultimately resulting in "QPixmap: Must
construct a QGuiApplication before a QPixmap". This patch fixes the
issue (except for systems which multiple screens, which is a separate
issue).
Task-number: QTBUG-40539
Change-Id: I4bafc9790741204e90190a4491ac7a9393d0d0a7
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
Diffstat (limited to 'src/quick/items/qquickimagebase.cpp')
| -rw-r--r-- | src/quick/items/qquickimagebase.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/items/qquickimagebase.cpp b/src/quick/items/qquickimagebase.cpp index bf67cbef26..738430dc89 100644 --- a/src/quick/items/qquickimagebase.cpp +++ b/src/quick/items/qquickimagebase.cpp @@ -292,10 +292,10 @@ void QQuickImageBase::handleWindowChanged(QQuickWindow* window) connect(window, SIGNAL(screenChanged(QScreen*)), this, SLOT(handleScreenChanged(QScreen*))); } -void QQuickImageBase::handleScreenChanged(QScreen*) +void QQuickImageBase::handleScreenChanged(QScreen* screen) { // Screen DPI might have changed, reload images on screen change. - if (isComponentComplete()) + if (screen && isComponentComplete()) load(); } |