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

Change-Id: I2f8f6b1d196548087219739faa3ad1517626da1e

3 files changed, 21 insertions, 8 deletions

diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp
index f0a5053196..438cd3de3a 100644
--- a/src/gui/text/qfont.cpp
+++ b/src/gui/text/qfont.cpp
@@ -727,11 +727,9 @@ void QFont::setFamily(const QString &family)
 /*!
     \since 4.8
 
-    Returns the requested font style name, it will be used to match the
+    Returns the requested font style name. This can be used to match the
     font with irregular styles (that can't be normalized in other style
-    properties). It depends on system font support, thus only works for
-    \macos and X11 so far. On Windows irregular styles will be added
-    as separate font families so there is no need for this.
+    properties).
 
     \sa setFamily(), setStyle()
 */
@@ -744,7 +742,12 @@ QString QFont::styleName() const
     \since 4.8
 
     Sets the style name of the font to \a styleName. When set, other style properties
-    like \l style() and \l weight() will be ignored for font matching.
+    like \l style() and \l weight() will be ignored for font matching, though they may be
+    simulated afterwards if supported by the platform's font engine.
+
+    Due to the lower quality of artificially simulated styles, and the lack of full cross
+    platform support, it is not recommended to use matching by style name together with
+    matching by style properties
 
     \sa styleName()
 */
@@ -985,6 +988,10 @@ int QFont::pixelSize() const
   Sets the style() of the font to QFont::StyleItalic if \a enable is true;
   otherwise the style is set to QFont::StyleNormal.
 
+  \note If styleName() is set, this value may be ignored, or if supported
+  on the platform, the font may be rendered tilted instead of picking a
+  designed italic font-variant.
+
   \sa italic(), QFontInfo
 */
 
@@ -1050,6 +1057,8 @@ int QFont::weight() const
     Sets the weight of the font to \a weight, using the scale defined by
     \l QFont::Weight enumeration.
 
+    \note If styleName() is set, this value may be ignored for font selection.
+
     \sa weight(), QFontInfo
 */
 void QFont::setWeight(int weight)
@@ -1083,6 +1092,9 @@ void QFont::setWeight(int weight)
 
     For finer boldness control use setWeight().
 
+    \note If styleName() is set, this value may be ignored, or if supported
+    on the platform, the font artificially embolded.
+
     \sa bold(), setWeight()
 */
 
diff --git a/src/plugins/platforms/cocoa/qnsview.mm b/src/plugins/platforms/cocoa/qnsview.mm
index 9708aa4ce6..28ffcf8718 100644
--- a/src/plugins/platforms/cocoa/qnsview.mm
+++ b/src/plugins/platforms/cocoa/qnsview.mm
@@ -1884,6 +1884,7 @@ static QPoint mapWindowCoordinates(QWindow *source, QWindow *target, QPoint poin
     }
     else {
         NSImage *nsimage = qt_mac_create_nsimage(pixmapCursor);
+        nsimage.size = NSSizeFromCGSize((pixmapCursor.size() / pixmapCursor.devicePixelRatioF()).toCGSize());
         nativeCursor = [[NSCursor alloc] initWithImage:nsimage hotSpot:NSZeroPoint];
         [nsimage release];
     }
diff --git a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
index 5baf4c0870..fffe853c14 100644
--- a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
@@ -6766,9 +6766,9 @@ void tst_QNetworkReply::getFromUnreachableIp()
 {
     QNetworkAccessManager manager;
 
-#ifdef Q_OS_WIN32
+#ifdef Q_OS_WIN
     // This test assumes that attempt to connect to 255.255.255.255 fails more
-    // or less fast/immediately. This is not what we observe on Windows x86:
+    // or less fast/immediately. This is not what we observe on Windows:
     // WSAConnect on non-blocking socket returns SOCKET_ERROR, WSAGetLastError
     // returns WSAEWOULDBLOCK (expected) and getsockopt most of the time returns
     // NOERROR; so socket engine starts a timer (30 s.) and waits for a timeout/
@@ -6806,7 +6806,7 @@ void tst_QNetworkReply::getFromUnreachableIp()
 #else // bearermanagement
     QSKIP("This test is non-deterministic on Windows x86");
 #endif // !bearermanagement
-#endif // Q_OS_WIN32
+#endif // Q_OS_WIN
 
     QNetworkRequest request(QUrl("http://255.255.255.255/42/23/narf/narf/narf"));
     QNetworkReplyPtr reply(manager.get(request));