diff options
author | Liang Qi <liang.qi@qt.io> | 2017-03-10 10:27:18 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-03-10 10:53:53 +0100 |
commit | a26ed9570c95f2315a2fc0b0f58d2cfebe955a00 (patch) | |
tree | 26146a1709d9f0c121dbfec1220904a1953ce08e | |
parent | a931d0799b46123422582635b79d217eee0ae6bd (diff) | |
parent | f1d8761b93fc3f23cb537b6e06f4502a3f214df0 (diff) |
Merge remote-tracking branch 'origin/5.8' into 5.9v5.9.0-beta3v5.9.0-beta2v5.9.0-beta1
Conflicts:
src/macextras/macextras-lib.pri
Change-Id: Iee350318a9e396fe1188823b6cae7e154da029af
-rw-r--r-- | dist/changes-5.8.0 | 10 | ||||
-rw-r--r-- | src/macextras/macextras-lib.pri | 1 |
2 files changed, 11 insertions, 0 deletions
diff --git a/dist/changes-5.8.0 b/dist/changes-5.8.0 new file mode 100644 index 0000000..db5f12a --- /dev/null +++ b/dist/changes-5.8.0 @@ -0,0 +1,10 @@ +Qt 5.8 introduces many new features and improvements as well as bugfixes +over the 5.7.x series. 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.8 series is binary compatible with the 5.7.x series. +Applications compiled for 5.7 will continue to run with 5.8. + +There were no changes in this module since the 5.7.x series. diff --git a/src/macextras/macextras-lib.pri b/src/macextras/macextras-lib.pri index eac6ad9..fc24111 100644 --- a/src/macextras/macextras-lib.pri +++ b/src/macextras/macextras-lib.pri @@ -35,6 +35,7 @@ macos { OBJECTIVE_SOURCES += $$PWD/qmacpasteboardmime.mm } + QT_PRIVATE += widgets LIBS_PRIVATE += -framework AppKit } |