From 6d5b07c509c109e2a0624e3fdfce926377e6ed60 Mon Sep 17 00:00:00 2001
From: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
Date: Thu, 15 Dec 2016 11:30:05 -0800
Subject: QWidget::clearMask(): Skip setMask() logic if there's no mask

In particular, this saves the allocation of the extra data
if no mask was set to begin with.

Change-Id: I402c28fa53c946134c853d52fc7435a50f2232f5
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
---
 src/widgets/kernel/qwidget.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
index 1db9f5d75e..cfa190a388 100644
--- a/src/widgets/kernel/qwidget.cpp
+++ b/src/widgets/kernel/qwidget.cpp
@@ -12955,6 +12955,9 @@ void QWidget::setMask(const QBitmap &bitmap)
 */
 void QWidget::clearMask()
 {
+    Q_D(QWidget);
+    if (!d->extra || !d->extra->hasMask)
+        return;
     setMask(QRegion());
 }
 
-- 
cgit v1.2.3