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 /src/macextras/qmacfunctions_mac.mm | |
| 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
Diffstat (limited to 'src/macextras/qmacfunctions_mac.mm')
| -rw-r--r-- | src/macextras/qmacfunctions_mac.mm | 3 |
1 files changed, 3 insertions, 0 deletions
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) |