aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-08-15 12:23:33 +0200
committerLiang Qi <liang.qi@qt.io>2017-08-15 13:22:37 +0200
commitc6d2605b07547a10c3400074307a2cdfb7be5167 (patch)
treee76bab1631b4208f22a53fd6525e6d012fa47085
parent1dae0da8b892fd93e8d09e95679cba3f419e66e7 (diff)
parentcb8ec72ad6398e442d9a6182fd2f71274509f8d2 (diff)
Merge remote-tracking branch 'origin/5.9' into devv5.10.0-beta3v5.10.0-beta2v5.10.0-beta1v5.10.0-alpha1
Conflicts: .qmake.conf Change-Id: I5f26e4760a8979d1b76761258e773d0870562971
-rw-r--r--dist/changes-5.9.124
-rw-r--r--src/macextras/macextras-lib.pri2
2 files changed, 26 insertions, 0 deletions
diff --git a/dist/changes-5.9.1 b/dist/changes-5.9.1
new file mode 100644
index 0000000..e0a6a4b
--- /dev/null
+++ b/dist/changes-5.9.1
@@ -0,0 +1,24 @@
+Qt 5.9.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.9.0.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+http://doc.qt.io/qt-5/index.html
+
+The Qt version 5.9 series is binary compatible with the 5.8.x series.
+Applications compiled for 5.8 will continue to run with 5.9.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+* Library *
+****************************************************************************
+
+ - This release contains only minor code improvements.
diff --git a/src/macextras/macextras-lib.pri b/src/macextras/macextras-lib.pri
index fc24111..7ff3ed6 100644
--- a/src/macextras/macextras-lib.pri
+++ b/src/macextras/macextras-lib.pri
@@ -6,6 +6,8 @@ PUBLIC_HEADERS += \
PRIVATE_HEADERS += $$PWD/qmacfunctions_p.h
OBJECTIVE_SOURCES += $$PWD/qmacfunctions.mm
+LIBS_PRIVATE += -framework Foundation
+
uikit:!watchos {
OBJECTIVE_SOURCES += \
$$PWD/qmacfunctions_ios.mm