diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2021-07-15 13:39:42 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2021-07-16 13:19:36 +0200 |
| commit | 03c600deb070578c0d1f33664a59211851347aac (patch) | |
| tree | aba61ddb06fbf18b68836b54ff1666636152a685 | |
| parent | 5f0dc160d30e12d5b14c81b0889126df51b8bdf1 (diff) | |
Update obsoleted functionality in preparation for Qt 6
Functionality that is obsoleted without a replacement
will have instructions in the Qt 6 porting guide.
Change-Id: I2e456abf7029244553c5157c6d9f018a968e3655
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| -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 |
5 files changed, 8 insertions, 0 deletions
diff --git a/src/macextras/qmacfunctions.mm b/src/macextras/qmacfunctions.mm index 11749f3..90b0a59 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 8764673..57169d0 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 1083aba..3dc1518 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 4ca9d5b..de1ad7f 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 c785d82..893e5bc 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. |