diff options
author | Konstantin Ritt <ritt.ks@gmail.com> | 2012-10-08 16:40:13 +0300 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-10 13:24:23 +0200 |
commit | 008e5ba61a68846ad29c65a2fe10b8c19c74f6eb (patch) | |
tree | 59f1bc75adb09b41b862de4145924368529ef95d /dist | |
parent | 34c31cd74cde7a1c36f3603a625fb0d28c259a6e (diff) |
Invalidate old QImage data if load()/loadFromData() has failed
This guarantees one will never get `!img.isNull()` after
load()/loadFromData() has failed, even if the image was
not null before.
Apply the same fix to QPixmap and QPicture.
Change-Id: Ida1ad6a6f0fc830df8e75ada0c163fc2d3360dea
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Diffstat (limited to 'dist')
-rw-r--r-- | dist/changes-5.0.0 | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/dist/changes-5.0.0 b/dist/changes-5.0.0 index a56325d40a..f2164087eb 100644 --- a/dist/changes-5.0.0 +++ b/dist/changes-5.0.0 @@ -494,6 +494,11 @@ QtGui For consistency with RGB32 and other 32-bit formats, function now expects image data in RGB layout as opposed to BGR layout. +* Behavioral change in QImage and QPixmap load()/loadFromData() on a non-null image: + If load() or loadFromData() fails to load the image (returns false) then + the existent image data will be invalidated, so that isNull() is guaranteed + to return true in this case. + QtWidgets --------- * QInputContext removed as well as related getters and setters on QWidget and QApplication. |