From 04b92bfa1a0654f939dea0c0c13072089139149b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Abecasis?= <joao.abecasis@nokia.com>
Date: Tue, 11 Sep 2012 20:00:29 +0200
Subject: Don't track the sharable bit upon detach
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

"Unsharables", given they can't be shared, don't need to detach, so skip the
check altogether and don't try to propagate the flag. It shouldn't be.

Change-Id: Icc483401d5a57708b43d64bd3cebc66c6b934815
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/corelib/tools/qarraydata.h | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'src')

diff --git a/src/corelib/tools/qarraydata.h b/src/corelib/tools/qarraydata.h
index 90503786e4..dd2b777ed7 100644
--- a/src/corelib/tools/qarraydata.h
+++ b/src/corelib/tools/qarraydata.h
@@ -101,10 +101,6 @@ struct Q_CORE_EXPORT QArrayData
     AllocationOptions detachFlags() const
     {
         AllocationOptions result;
-#if QT_SUPPORTS(UNSHARABLE_CONTAINERS)
-        if (!ref.isSharable())
-            result |= Unsharable;
-#endif
         if (capacityReserved)
             result |= CapacityReserved;
         return result;
-- 
cgit v1.2.3