8 files changed, 35 insertions, 20 deletions
diff --git a/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro b/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro
index 1bfeabb8c4..5ec86bf78f 100644
--- a/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro
+++ b/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro
@@ -11,7 +11,7 @@ load(qt_helper_lib)
 SHAPERS += opentype       # HB's main shaper; enabling it should be enough most of the time
 
 # native shaper on Apple platforms; could be used alone to handle both OT and AAT fonts
-darwin:!if(watchos:CONFIG(simulator, simulator|device)): SHAPERS += coretext
+darwin: SHAPERS += coretext
 
 DEFINES += HAVE_CONFIG_H
 DEFINES += HB_NO_UNICODE_FUNCS HB_DISABLE_DEPRECATED
@@ -155,4 +155,14 @@ contains(SHAPERS, coretext) {
         # On Mac OS they are part of the ApplicationServices umbrella framework,
         # even in 10.8 where they were also made available stand-alone.
         LIBS_PRIVATE += -framework ApplicationServices
+
+    # CoreText is documented to be available on watchOS, but the headers aren't present
+    # in the watchOS Simulator SDK like they are supposed to be. Work around the problem
+    # by adding the device SDK's headers to the search path as a fallback.
+    # rdar://25314492, rdar://27844864
+    watchos:CONFIG(simulator, simulator|device) {
+        QMAKE_CXXFLAGS += \
+            -F$$xcodeSDKInfo(Path, $${simulator.sdk})/System/Library/Frameworks \
+            -F$$xcodeSDKInfo(Path, $${device.sdk})/System/Library/Frameworks
+    }
 }
diff --git a/src/corelib/io/qdatastream.h b/src/corelib/io/qdatastream.h
index ac58677b77..7ce4f0a92f 100644
--- a/src/corelib/io/qdatastream.h
+++ b/src/corelib/io/qdatastream.h
@@ -95,10 +95,11 @@ public:
         Qt_5_6 = 17,
         Qt_5_7 = Qt_5_6,
         Qt_5_8 = Qt_5_7,
-#if QT_VERSION >= 0x050900
+        Qt_5_9 = Qt_5_8,
+#if QT_VERSION >= 0x050a00
 #error Add the datastream version for this Qt version and update Qt_DefaultCompiledVersion
 #endif
-        Qt_DefaultCompiledVersion = Qt_5_8
+        Qt_DefaultCompiledVersion = Qt_5_9
     };
 
     enum ByteOrder {
diff --git a/src/network/access/qnetworkaccessbackend_p.h b/src/network/access/qnetworkaccessbackend_p.h
index 7f39c942a3..4b5422ce29 100644
--- a/src/network/access/qnetworkaccessbackend_p.h
+++ b/src/network/access/qnetworkaccessbackend_p.h
@@ -63,7 +63,6 @@ class QNetworkProxyQuery;
 class QNetworkRequest;
 class QStringList;
 class QUrl;
-class QUrlInfo;
 class QSslConfiguration;
 
 class QNetworkAccessManagerPrivate;
diff --git a/src/network/kernel/kernel.pri b/src/network/kernel/kernel.pri
index 8f37e28669..7ef387beb4 100644
--- a/src/network/kernel/kernel.pri
+++ b/src/network/kernel/kernel.pri
@@ -57,8 +57,7 @@ win32: {
 
 mac {
     LIBS_PRIVATE += -framework CoreFoundation
-    !uikit: LIBS_PRIVATE += -framework CoreServices
-    !if(watchos:CONFIG(device, simulator|device)): LIBS_PRIVATE += -framework SystemConfiguration
+    !uikit: LIBS_PRIVATE += -framework CoreServices -framework SystemConfiguration
 }
 
 osx:SOURCES += kernel/qnetworkproxy_mac.cpp
diff --git a/src/platformsupport/fontdatabases/fontdatabases.pri b/src/platformsupport/fontdatabases/fontdatabases.pri
index f8e51f2a6d..1ea7f42204 100644
--- a/src/platformsupport/fontdatabases/fontdatabases.pri
+++ b/src/platformsupport/fontdatabases/fontdatabases.pri
@@ -1,4 +1,4 @@
-darwin:!if(watchos:CONFIG(simulator, simulator|device)) {
+darwin {
     include($$PWD/mac/coretext.pri)
 } else {
     !win32|qtConfig(freetype) {
diff --git a/src/platformsupport/fontdatabases/mac/coretext.pri b/src/platformsupport/fontdatabases/mac/coretext.pri
index 4d19a59226..e1132cfcbe 100644
--- a/src/platformsupport/fontdatabases/mac/coretext.pri
+++ b/src/platformsupport/fontdatabases/mac/coretext.pri
@@ -14,3 +14,13 @@ else: \
     # On Mac OS they are part of the ApplicationServices umbrella framework,
     # even in 10.8 where they were also made available stand-alone.
     LIBS_PRIVATE += -framework ApplicationServices
+
+# CoreText is documented to be available on watchOS, but the headers aren't present
+# in the watchOS Simulator SDK like they are supposed to be. Work around the problem
+# by adding the device SDK's headers to the search path as a fallback.
+# rdar://25314492, rdar://27844864
+watchos:CONFIG(simulator, simulator|device) {
+    QMAKE_CXXFLAGS += \
+        -F$$xcodeSDKInfo(Path, $${simulator.sdk})/System/Library/Frameworks \
+        -F$$xcodeSDKInfo(Path, $${device.sdk})/System/Library/Frameworks
+}
diff --git a/src/widgets/accessible/simplewidgets.cpp b/src/widgets/accessible/simplewidgets.cpp
index e6fda103fb..bd9f0c6e01 100644
--- a/src/widgets/accessible/simplewidgets.cpp
+++ b/src/widgets/accessible/simplewidgets.cpp
@@ -468,21 +468,15 @@ QVector<QPair<QAccessibleInterface*, QAccessible::Relation> >
 QAccessibleDisplay::relations(QAccessible::Relation match /* = QAccessible::AllRelations */) const
 {
     QVector<QPair<QAccessibleInterface*, QAccessible::Relation> > rels = QAccessibleWidget::relations(match);
-    if (match & QAccessible::Labelled) {
-        QVarLengthArray<QObject *, 4> relatedObjects;
-
 #ifndef QT_NO_SHORTCUT
+    if (match & QAccessible::Labelled) {
         if (QLabel *label = qobject_cast<QLabel*>(object())) {
-            relatedObjects.append(label->buddy());
-        }
-#endif
-        for (int i = 0; i < relatedObjects.count(); ++i) {
             const QAccessible::Relation rel = QAccessible::Labelled;
-            QAccessibleInterface *iface = QAccessible::queryAccessibleInterface(relatedObjects.at(i));
-            if (iface)
+            if (QAccessibleInterface *iface = QAccessible::queryAccessibleInterface(label->buddy()))
                 rels.append(qMakePair(iface, rel));
         }
     }
+#endif
     return rels;
 }
 
diff --git a/src/widgets/graphicsview/qgraphicsanchorlayout_p.cpp b/src/widgets/graphicsview/qgraphicsanchorlayout_p.cpp
index 4c01219d87..02956b76f9 100644
--- a/src/widgets/graphicsview/qgraphicsanchorlayout_p.cpp
+++ b/src/widgets/graphicsview/qgraphicsanchorlayout_p.cpp
@@ -2575,10 +2575,12 @@ void QGraphicsAnchorLayoutPrivate::identifyFloatItems(const QSet<AnchorData *> &
     for (const AnchorData *ad : visited)
         identifyNonFloatItems_helper(ad, &nonFloating);
 
-    QSet<QGraphicsLayoutItem *> allItems;
-    foreach (QGraphicsLayoutItem *item, items)
-        allItems.insert(item);
-    m_floatItems[orientation] = allItems - nonFloating;
+    QSet<QGraphicsLayoutItem *> floatItems;
+    for (QGraphicsLayoutItem *item : qAsConst(items)) {
+        if (!nonFloating.contains(item))
+            floatItems.insert(item);
+    }
+    m_floatItems[orientation] = std::move(floatItems);
 }