Merge remote-tracking branch 'origin/5.9' into dev

Conflicts:
	.qmake.conf

Change-Id: I205d3f1985b27045e93519c3818c51e559c15b77

6 files changed, 23 insertions, 3 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/dist/changes-5.9.0 b/dist/changes-5.9.0
new file mode 100644
index 0000000..a9f5f66
--- /dev/null
+++ b/dist/changes-5.9.0
@@ -0,0 +1,10 @@
+Qt 5.9 introduces many new features and improvements as well as bugfixes
+over the 5.8.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.9 series is binary compatible with the 5.8.x series.
+Applications compiled for 5.8 will continue to run with 5.9.
+
+There were no changes in this module since the 5.8.x series.
diff --git a/examples/examples.pro b/examples/examples.pro
index 37692d4..1f586b9 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -1,2 +1,2 @@
 TEMPLATE = subdirs
-SUBDIRS = macextras
+darwin: SUBDIRS = macextras
diff --git a/qtmacextras.pro b/qtmacextras.pro
index 78cfe59..58c33f2 100644
--- a/qtmacextras.pro
+++ b/qtmacextras.pro
@@ -1,2 +1 @@
-requires(darwin)
 load(qt_parts)
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
 }
 
diff --git a/tests/tests.pro b/tests/tests.pro
index 7fbc8a9..d365f4d 100644
--- a/tests/tests.pro
+++ b/tests/tests.pro
@@ -1,2 +1,2 @@
 TEMPLATE = subdirs
-SUBDIRS = auto
+darwin: SUBDIRS = auto