diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@qt.io> | 2016-06-29 16:20:31 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2016-08-30 01:52:53 +0000 |
| commit | bc1b45ff9f952edd0676e5d9509f9adef746c977 (patch) | |
| tree | 4d263b4590c3008a66efdc6f6d349488519544cc /configure | |
| parent | 4c1c68b2ba2f01639fc03ca947fdd37479537ad2 (diff) | |
QSettings: Remove calls to deprecated API on macOS
CFURLCreateDataAndPropertiesFromResource and
CFURLWriteDataAndPropertiestoResource have been
deprecated since 10.9. We replace them with simple
QFile access.
Code cleaning and included.
Change-Id: I19c7ceac41c8c511962f1128bd8e210e3adb434c
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -1746,11 +1746,13 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; EXTRA_OBJS="$EXTRA_OBJS \ qsettings_mac.o \ qcore_mac.o \ - qcore_mac_objc.o" + qcore_mac_objc.o \ + qcore_foundation.o" EXTRA_SRCS="$EXTRA_SRCS \ \"\$(SOURCE_PATH)/src/corelib/io/qsettings_mac.cpp\" \ \"\$(SOURCE_PATH)/src/corelib/kernel/qcore_mac.cpp\" \ - \"\$(SOURCE_PATH)/src/corelib/kernel/qcore_mac_objc.mm\"" + \"\$(SOURCE_PATH)/src/corelib/kernel/qcore_mac_objc.mm\" \ + \"\$(SOURCE_PATH)/src/corelib/kernel/qcore_foundation.mm\"" fi echo >>"$mkfile" |