From b8dbde10a065c3ba95b794b6d53ff62e8ca22ee7 Mon Sep 17 00:00:00 2001
From: Thierry Bastian <thierryb@filewave.com>
Date: Mon, 30 Jan 2017 19:02:23 +0100
Subject: Fix data corruption when reading byte arrays from QSettings
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

On macOS, the code that read the plist is using
QByteArray::fromRawCFData. When we return the data directly
we need to detach the QByteArray so that it does not point
CFData's data that will get deallocated just after the call.

Task-number: QTBUG-58531
Change-Id: If829a304b986c99c8fc2aeeb992f2d539a4eef3a
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
---
 tests/auto/corelib/io/qsettings/qsettings.qrc | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tests/auto/corelib/io/qsettings/qsettings.qrc')

diff --git a/tests/auto/corelib/io/qsettings/qsettings.qrc b/tests/auto/corelib/io/qsettings/qsettings.qrc
index c0be7e013f..c664a6f68c 100644
--- a/tests/auto/corelib/io/qsettings/qsettings.qrc
+++ b/tests/auto/corelib/io/qsettings/qsettings.qrc
@@ -5,6 +5,7 @@
         <file>resourcefile3.ini</file>
         <file>resourcefile4.ini</file>
         <file>resourcefile5.ini</file>
+        <file>resourcefile6.plist</file>
         <file>bom.ini</file>
     </qresource>
 </RCC>
-- 
cgit v1.2.3