Merge remote-tracking branch 'origin/release' into stablev5.3.1

Change-Id: I56a541591b5be2ab5672735d5fe4e26b98c3d77c

6 files changed, 23 insertions, 7 deletions

diff --git a/examples/macextras/embeddedqwindow/doc/src/qtmacextras-example-embeddedqwindow.qdoc b/examples/macextras/embeddedqwindow/doc/src/qtmacextras-example-embeddedqwindow.qdoc
index b4e1e37..e5bab01 100644
--- a/examples/macextras/embeddedqwindow/doc/src/qtmacextras-example-embeddedqwindow.qdoc
+++ b/examples/macextras/embeddedqwindow/doc/src/qtmacextras-example-embeddedqwindow.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the documentation of the Qt Toolkit.
@@ -34,4 +34,8 @@
 
     This Mac OS X-specific example shows how to create a view hierarchy
     containing a QWindow, with handling of Qt's mouse and keyboard events.
+
+    \include examples-run.qdocinc
+
+    \sa {Qt for Mac OS X}, {Qt Mac Extras}
 */
diff --git a/examples/macextras/macfunctions/doc/src/qtmacextras-example-macfunctions.qdoc b/examples/macextras/macfunctions/doc/src/qtmacextras-example-macfunctions.qdoc
index 4b6c447..bcd6f40 100644
--- a/examples/macextras/macfunctions/doc/src/qtmacextras-example-macfunctions.qdoc
+++ b/examples/macextras/macfunctions/doc/src/qtmacextras-example-macfunctions.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the documentation of the Qt Toolkit.
@@ -33,4 +33,8 @@
 
     This example shows how to convert an image between a QPixmap and a
     CGImageRef using functions from the \l QtMac namespace.
+
+    \include examples-run.qdocinc
+
+    \sa {Qt for Mac OS X}, {Qt Mac Extras}
 */
diff --git a/examples/macextras/macpasteboardmime/doc/src/qtmacextras-example-macpasteboardmime.qdoc b/examples/macextras/macpasteboardmime/doc/src/qtmacextras-example-macpasteboardmime.qdoc
index 53dfb68..df99169 100644
--- a/examples/macextras/macpasteboardmime/doc/src/qtmacextras-example-macpasteboardmime.qdoc
+++ b/examples/macextras/macpasteboardmime/doc/src/qtmacextras-example-macpasteboardmime.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the documentation of the Qt Toolkit.
@@ -37,4 +37,8 @@
 
     The example creates a widget that accepts drag & drop events, and
     reads contents of dropped business cards in vCard format.
+
+    \include examples-run.qdocinc
+
+    \sa {Qt for Mac OS X}, {Qt Mac Extras}
 */
diff --git a/src/macextras/doc/qtmacextras.qdocconf b/src/macextras/doc/qtmacextras.qdocconf
index e7690c5..0c7aaf9 100644
--- a/src/macextras/doc/qtmacextras.qdocconf
+++ b/src/macextras/doc/qtmacextras.qdocconf
@@ -13,8 +13,8 @@ examplesinstallpath     = macextras
 # Add a generic 'Qt Code Sample' thumbnail in Qt Creator for all examples
 manifestmeta.thumbnail.names += "QtMacExtras/*"
 
-headerdirs = ..
-sourcedirs = ..
+headerdirs += ..
+sourcedirs += ..
 imagedirs += images
 
 Cpp.ignoretokens += Q_MACEXTRAS_EXPORT
diff --git a/src/macextras/qmacfunctions.h b/src/macextras/qmacfunctions.h
index c624d15..cf7cc2a 100644
--- a/src/macextras/qmacfunctions.h
+++ b/src/macextras/qmacfunctions.h
@@ -66,8 +66,10 @@ class QWindow;
 
 namespace QtMac
 {
-Q_MACEXTRAS_EXPORT NSData *toNSData(const QByteArray &data);
-Q_MACEXTRAS_EXPORT QByteArray fromNSData(const NSData *data);
+#if QT_DEPRECATED_SINCE(5,3)
+QT_DEPRECATED Q_MACEXTRAS_EXPORT NSData *toNSData(const QByteArray &data);
+QT_DEPRECATED Q_MACEXTRAS_EXPORT QByteArray fromNSData(const NSData *data);
+#endif
 
 Q_MACEXTRAS_EXPORT CGImageRef toCGImageRef(const QPixmap &pixmap);
 Q_MACEXTRAS_EXPORT QPixmap fromCGImageRef(CGImageRef image);
diff --git a/src/macextras/qmacfunctions.mm b/src/macextras/qmacfunctions.mm
index 881826a..2a76877 100644
--- a/src/macextras/qmacfunctions.mm
+++ b/src/macextras/qmacfunctions.mm
@@ -66,6 +66,7 @@ QT_BEGIN_NAMESPACE
 namespace QtMac
 {
 
+#if QT_DEPRECATED_SINCE(5,3)
 /*!
     \obsolete
 
@@ -88,6 +89,7 @@ QByteArray fromNSData(const NSData *data)
     [data getBytes:ba.data() length:ba.size()];
     return ba;
 }
+#endif // QT_DEPRECATED_SINCE
 
 /*!
     Creates a \c CGImageRef equivalent to the QPixmap. Returns the \c CGImageRef handle.