summaryrefslogtreecommitdiffstats
path: root/src/gui/image
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/image')
-rw-r--r--src/gui/image/qimage.cpp2
-rw-r--r--src/gui/image/qnativeimage.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp
index 48c262ae7a..3998bbf3ff 100644
--- a/src/gui/image/qimage.cpp
+++ b/src/gui/image/qimage.cpp
@@ -611,7 +611,7 @@ bool QImageData::checkForAlphaPixels() const
*/
/*!
- \fn QImage &operator=(QImage &&other)
+ \fn QImage &QImage::operator=(QImage &&other)
Move-assigns \a other to this QImage instance.
diff --git a/src/gui/image/qnativeimage.cpp b/src/gui/image/qnativeimage.cpp
index 09cdf41399..356bdc09e4 100644
--- a/src/gui/image/qnativeimage.cpp
+++ b/src/gui/image/qnativeimage.cpp
@@ -64,6 +64,8 @@ QNativeImage::~QNativeImage()
QImage::Format QNativeImage::systemFormat()
{
+ if (!QGuiApplication::primaryScreen())
+ return QImage::Format_Invalid;
return QGuiApplication::primaryScreen()->handle()->format();
}