diff options
| author | Thierry Bastian <thierryb@filewave.com> | 2017-01-30 19:02:23 +0100 |
|---|---|---|
| committer | Thierry Bastian <thierryb@filewave.com> | 2017-02-03 15:37:58 +0000 |
| commit | b8dbde10a065c3ba95b794b6d53ff62e8ca22ee7 (patch) | |
| tree | f0871b2f0b9eb0e9744345bac9d8d2b41a6338d9 /tests/auto/corelib/io/qsettings/qsettings.qrc | |
| parent | c7762f117819738a426dd091246a48befdcbef08 (diff) | |
Fix data corruption when reading byte arrays from QSettings
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>
Diffstat (limited to 'tests/auto/corelib/io/qsettings/qsettings.qrc')
| -rw-r--r-- | tests/auto/corelib/io/qsettings/qsettings.qrc | 1 |
1 files changed, 1 insertions, 0 deletions
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> |