diff options
author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-08-16 20:37:32 +0300 |
---|---|---|
committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-08-16 20:37:32 +0300 |
commit | c9bf2516187331033f0860976497eab0828cf25e (patch) | |
tree | e6d0cc9e811a6906470f975cb43692b50275680e | |
parent | 166cb4d6166cab60a66a074c848f6ed725e6755c (diff) | |
parent | 03c600deb070578c0d1f33664a59211851347aac (diff) |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.6' into tqtc/lts-5.15-opensourcev5.15.6-lts-lgpl
Change-Id: Idca6a0f78bcb543d55d7bd0d70c99d1071af484c
-rw-r--r-- | .qmake.conf | 2 | ||||
-rw-r--r-- | src/macextras/qmacfunctions.mm | 1 | ||||
-rw-r--r-- | src/macextras/qmacfunctions_mac.mm | 3 | ||||
-rw-r--r-- | src/macextras/qmacpasteboardmime.mm | 2 | ||||
-rw-r--r-- | src/macextras/qmactoolbar.mm | 1 | ||||
-rw-r--r-- | src/macextras/qmactoolbaritem.mm | 1 |
6 files changed, 9 insertions, 1 deletions
diff --git a/.qmake.conf b/.qmake.conf index 7596096..d7075cd 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) DEFINES += QT_NO_FOREACH -MODULE_VERSION = 5.15.5 +MODULE_VERSION = 5.15.6 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. |