aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.qmake.conf2
-rw-r--r--dist/changes-5.15.228
-rw-r--r--src/macextras/qmacfunctions.h5
-rw-r--r--src/macextras/qmacfunctions.mm1
-rw-r--r--src/macextras/qmacfunctions_mac.mm3
-rw-r--r--src/macextras/qmacpasteboardmime.mm2
-rw-r--r--src/macextras/qmactoolbar.mm1
-rw-r--r--src/macextras/qmactoolbaritem.mm1
8 files changed, 41 insertions, 2 deletions
diff --git a/.qmake.conf b/.qmake.conf
index 08e181c..3b6b32b 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -2,4 +2,4 @@ load(qt_build_config)
DEFINES += QT_NO_FOREACH
-MODULE_VERSION = 5.15.3
+MODULE_VERSION = 5.15.13
diff --git a/dist/changes-5.15.2 b/dist/changes-5.15.2
new file mode 100644
index 0000000..3f584ae
--- /dev/null
+++ b/dist/changes-5.15.2
@@ -0,0 +1,28 @@
+Qt 5.15.2 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.15.1.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+ https://doc.qt.io/qt-5.15/index.html
+
+The Qt version 5.15 series is binary compatible with the 5.14.x series.
+Applications compiled for 5.14 will continue to run with 5.15.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+ https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+* Important Behavior Changes *
+****************************************************************************
+
+****************************************************************************
+* Library *
+****************************************************************************
+
+
diff --git a/src/macextras/qmacfunctions.h b/src/macextras/qmacfunctions.h
index 88be13c..efd17d4 100644
--- a/src/macextras/qmacfunctions.h
+++ b/src/macextras/qmacfunctions.h
@@ -93,8 +93,11 @@ Q_MACEXTRAS_EXPORT NSImage *toNSImage(const QPixmap &pixmap);
#endif
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-Q_MACEXTRAS_EXPORT bool isMainWindow(QWindow *window);
+# if QT_DEPRECATED_SINCE(5, 15)
+QT_DEPRECATED_X("Use QWindow::winId() and view.window.isMainWindow") Q_MACEXTRAS_EXPORT bool isMainWindow(QWindow *window);
+# endif
#endif
+
#endif // Q_OS_OSX
#if defined(QT_PLATFORM_UIKIT) && !defined(Q_OS_WATCHOS)
diff --git a/src/macextras/qmacfunctions.mm b/src/macextras/qmacfunctions.mm
index afd704c..ca5437d 100644
--- a/src/macextras/qmacfunctions.mm
+++ b/src/macextras/qmacfunctions.mm
@@ -134,6 +134,7 @@ CGImageRef toCGImageRef(const QPixmap &pixmap)
/*!
\fn QPixmap QtMac::fromCGImageRef(CGImageRef image)
+ \obsolete
Returns a QPixmap that is equivalent to the given \a image.
diff --git a/src/macextras/qmacfunctions_mac.mm b/src/macextras/qmacfunctions_mac.mm
index 03cbcab..4ce5da7 100644
--- a/src/macextras/qmacfunctions_mac.mm
+++ b/src/macextras/qmacfunctions_mac.mm
@@ -84,8 +84,10 @@ NSImage* toNSImage(const QPixmap &pixmap)
#endif
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+# if QT_DEPRECATED_SINCE(5, 15)
/*!
\fn bool isMainWindow(QWindow *window)
+ \obsolete Use QWindow::winId() and view.window.isMainWindow instead.
Returns whether the given QWindow \a window is the application's main window
*/
@@ -98,6 +100,7 @@ bool isMainWindow(QWindow *window)
return [macWindow isMainWindow];
}
+# endif
#endif
#if QT_DEPRECATED_SINCE(5, 12)
diff --git a/src/macextras/qmacpasteboardmime.mm b/src/macextras/qmacpasteboardmime.mm
index 44bdacb..2945c58 100644
--- a/src/macextras/qmacpasteboardmime.mm
+++ b/src/macextras/qmacpasteboardmime.mm
@@ -48,6 +48,7 @@ QT_BEGIN_NAMESPACE
/*!
\fn void qRegisterDraggedTypes(const QStringList &types)
+ \obsolete
\relates QMacPasteboardMime
Registers the given \a types as custom pasteboard types.
@@ -70,6 +71,7 @@ void qRegisterDraggedTypes(const QStringList &types)
/*!
\class QMacPasteboardMime
+ \obsolete
\inmodule QtMacExtras
\since 5.2
\brief The QMacPasteboardMime class converts between a MIME type and a
diff --git a/src/macextras/qmactoolbar.mm b/src/macextras/qmactoolbar.mm
index 1881c4f..6e7c80a 100644
--- a/src/macextras/qmactoolbar.mm
+++ b/src/macextras/qmactoolbar.mm
@@ -63,6 +63,7 @@ QT_BEGIN_NAMESPACE
/*!
\class QMacToolBar
+ \obsolete
\inmodule QtMacExtras
\since 5.3
\brief The QMacToolBar class wraps the native NSToolbar class.
diff --git a/src/macextras/qmactoolbaritem.mm b/src/macextras/qmactoolbaritem.mm
index 3bb3a5a..7d6e894 100644
--- a/src/macextras/qmactoolbaritem.mm
+++ b/src/macextras/qmactoolbaritem.mm
@@ -47,6 +47,7 @@ QT_BEGIN_NAMESPACE
/*!
\class QMacToolBarItem
+ \obsolete
\inmodule QtMacExtras
\since 5.3
\brief The QMacToolBarItem class provides an item for QMacToolBar.