diff options
| author | Iikka Eklund <iikka.eklund@digia.com> | 2014-04-01 11:44:26 +0300 |
|---|---|---|
| committer | Iikka Eklund <iikka.eklund@digia.com> | 2014-04-01 11:44:27 +0300 |
| commit | 0ab63b035a649dc1982c867cd37d466d249004b9 (patch) | |
| tree | 6de22edcd3957aae3eee698136a000e52ab7f8fe /src/gui/image | |
| parent | a6f8aa0ae1d5a1d1099df1891ea60b14b6eb6065 (diff) | |
| parent | 0cb2c760c219514849ab0f6be8e5368f92dfa5d9 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I2a6eb9dd7724931bc89f28bcc156e77c4e26d069
Diffstat (limited to 'src/gui/image')
| -rw-r--r-- | src/gui/image/qimage.cpp | 2 | ||||
| -rw-r--r-- | src/gui/image/qnativeimage.cpp | 2 |
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(); } |