From 5643ee6b7836e3fe647f6773c99eaff2f686ea84 Mon Sep 17 00:00:00 2001 From: Tarja Sundqvist Date: Mon, 7 Jun 2021 18:02:09 +0300 Subject: Bump version --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3 From 6acbb80b9062e9ee543cfed559c214c6a6687c6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Thu, 15 Jul 2021 15:13:43 +0200 Subject: Update obsoleted functionality in preparation for Qt 6 Functionality that is obsoleted without a replacement will have instructions in the Qt 6 porting guide. Task-number: QTBUG-89564 Change-Id: I82e112bd3bda5942a618bebea8cbdc683241a660 Reviewed-by: Oliver Wolff --- src/winextras/qwinfunctions.cpp | 103 ++++++++++++++++++++++++++++++ src/winextras/qwinjumplist.cpp | 1 + src/winextras/qwinjumplistcategory.cpp | 1 + src/winextras/qwinjumplistitem.cpp | 1 + src/winextras/qwinmime.cpp | 1 + src/winextras/qwintaskbarbutton.cpp | 1 + src/winextras/qwintaskbarprogress.cpp | 1 + src/winextras/qwinthumbnailtoolbar.cpp | 1 + src/winextras/qwinthumbnailtoolbutton.cpp | 1 + 9 files changed, 111 insertions(+) diff --git a/src/winextras/qwinfunctions.cpp b/src/winextras/qwinfunctions.cpp index 799da6c..bcd22f8 100644 --- a/src/winextras/qwinfunctions.cpp +++ b/src/winextras/qwinfunctions.cpp @@ -89,6 +89,10 @@ Q_GUI_EXPORT QPixmap qt_pixmapFromWinHICON(HICON icon); It is the caller's responsibility to free the \c HBITMAP data after use. + \obsolete + + Use image.convertToFormat(QImage::Format_Mono).invertPixels().toHBITMAP() instead. + \sa toHBITMAP() */ HBITMAP QtWin::createMask(const QBitmap &bitmap) @@ -105,6 +109,8 @@ HBITMAP QtWin::createMask(const QBitmap &bitmap) It is the caller's responsibility to free the \c HBITMAP data after use. + \obsolete Use QImage::toHBITMAP() instead. + \sa fromHBITMAP() */ HBITMAP QtWin::toHBITMAP(const QPixmap &p, QtWin::HBitmapFormat format) @@ -118,6 +124,8 @@ HBITMAP QtWin::toHBITMAP(const QPixmap &p, QtWin::HBitmapFormat format) Returns a QPixmap that is equivalent to the given \a bitmap. The conversion is based on the specified \a format. + \obsolete Use QImage::fromHBITMAP() instead. + \sa toHBITMAP() */ QPixmap QtWin::fromHBITMAP(HBITMAP bitmap, QtWin::HBitmapFormat format) @@ -133,6 +141,8 @@ QPixmap QtWin::fromHBITMAP(HBITMAP bitmap, QtWin::HBitmapFormat format) It is the caller's responsibility to free the \c HICON data after use. + \obsolete Use QImage::toHICON() instead. + \sa fromHICON() */ HICON QtWin::toHICON(const QPixmap &p) @@ -149,6 +159,8 @@ HICON QtWin::toHICON(const QPixmap &p) It is the caller's responsibility to free the \c HBITMAP data after use. + \obsolete Use QImage::toHBITMAP() instead. + \sa imageFromHBITMAP() */ HBITMAP QtWin::imageToHBITMAP(const QImage &image, QtWin::HBitmapFormat format) @@ -163,6 +175,8 @@ HBITMAP QtWin::imageToHBITMAP(const QImage &image, QtWin::HBitmapFormat format) given \a bitmap. The conversion is based on the specified \c HDC context \a hdc using the specified \a width and \a height. + \obsolete Use QImage::fromHBITMAP() instead. + \sa toHBITMAP() */ QImage QtWin::imageFromHBITMAP(HDC hdc, HBITMAP bitmap, int width, int height) @@ -176,6 +190,8 @@ QImage QtWin::imageFromHBITMAP(HDC hdc, HBITMAP bitmap, int width, int height) Returns a QImage that is equivalent to the given \a bitmap. The conversion is based on the specified \a format. + \obsolete Use QImage::fromHBITMAP() instead. + \sa imageToHBITMAP() */ QImage QtWin::imageFromHBITMAP(HBITMAP bitmap, QtWin::HBitmapFormat format) @@ -188,6 +204,8 @@ QImage QtWin::imageFromHBITMAP(HBITMAP bitmap, QtWin::HBitmapFormat format) Returns a QPixmap that is equivalent to the given \a icon. + \obsolete Use QImage::fromHICON() instead. + \sa toHICON() */ QPixmap QtWin::fromHICON(HICON icon) @@ -204,6 +222,8 @@ HRGN qt_RectToHRGN(const QRect &rc) \since 5.2 Returns a HRGN that is equivalent to the given \a region. + + \obsolete Use QRegion::toHRGN() instead. */ HRGN QtWin::toHRGN(const QRegion ®ion) { @@ -228,6 +248,8 @@ HRGN QtWin::toHRGN(const QRegion ®ion) \since 5.2 Returns a QRegion that is equivalent to the given \a hrgn. + + \obsolete Use QRegion::fromHRGN() instead. */ QRegion QtWin::fromHRGN(HRGN hrgn) { @@ -257,6 +279,8 @@ QRegion QtWin::fromHRGN(HRGN hrgn) Returns a message string that explains the \a hresult error id specified or an empty string if the explanation cannot be found. + + \obsolete Use \c qt_error_string() instead. */ QString QtWin::stringFromHresult(HRESULT hresult) { @@ -269,6 +293,8 @@ QString QtWin::stringFromHresult(HRESULT hresult) Returns the code name of the \a hresult error id specified (usually the name of the WinAPI macro) or an empty string if the message is unknown. + + \obsolete */ QString QtWin::errorStringFromHresult(HRESULT hresult) { @@ -1461,6 +1487,8 @@ QString QtWin::errorStringFromHresult(HRESULT hresult) Returns the DWM colorization color. After the function returns, the optional \a opaqueBlend will contain true if the color is an opaque blend and false otherwise. + + \obsolete */ QColor QtWin::colorizationColor(bool *opaqueBlend) { @@ -1482,6 +1510,8 @@ QColor QtWin::colorizationColor(bool *opaqueBlend) alpha-blended color which often turns out a semitransparent gray rather than something similar to what is chosen by the user. + \obsolete + \sa colorizationColor() */ QColor QtWin::realColorizationColor() @@ -1501,12 +1531,16 @@ QColor QtWin::realColorizationColor() \fn QtWin::setWindowExcludedFromPeek(QWidget *window, bool exclude) \since 5.2 \overload QtWin::setWindowExcludedFromPeek() + + \obsolete */ /*! \since 5.2 Excludes the specified \a window from Aero Peek if \a exclude is true. + + \obsolete Use DwmSetWindowAttribute with DWMWA_EXCLUDED_FROM_PEEK instead. */ void QtWin::setWindowExcludedFromPeek(QWindow *window, bool exclude) { @@ -1518,12 +1552,16 @@ void QtWin::setWindowExcludedFromPeek(QWindow *window, bool exclude) \fn bool QtWin::isWindowExcludedFromPeek(QWidget *window) \since 5.2 \overload QtWin::isWindowExcludedFromPeek() + + \obsolete */ /*! \since 5.2 Returns true if the specified \a window is excluded from Aero Peek. + + \obsolete Check DwmGetWindowAttribute with DWMWA_EXCLUDED_FROM_PEEK instead. */ bool QtWin::isWindowExcludedFromPeek(QWindow *window) { @@ -1535,6 +1573,8 @@ bool QtWin::isWindowExcludedFromPeek(QWindow *window) \fn void QtWin::setWindowDisallowPeek(QWidget *window, bool disallow) \since 5.2 \overload QtWin::setWindowDisallowPeek() + + \obsolete */ /*! @@ -1545,6 +1585,8 @@ bool QtWin::isWindowExcludedFromPeek(QWindow *window) true; otherwise allows it. The default is false. + + \obsolete Use DwmSetWindowAttribute with DWMWA_DISALLOW_PEEK instead. */ void QtWin::setWindowDisallowPeek(QWindow *window, bool disallow) { @@ -1556,6 +1598,8 @@ void QtWin::setWindowDisallowPeek(QWindow *window, bool disallow) \fn bool QtWin::isWindowPeekDisallowed(QWidget *window) \since 5.2 \overload QtWin::isWindowPeekDisallowed() + + \obsolete */ /*! @@ -1563,6 +1607,8 @@ void QtWin::setWindowDisallowPeek(QWindow *window, bool disallow) Returns true if Aero Peek is disallowed on the thumbnail of the specified \a window. + + \obsolete Check DwmGetWindowAttribute with DWMWA_DISALLOW_PEEK instead. */ bool QtWin::isWindowPeekDisallowed(QWindow *window) { @@ -1580,6 +1626,8 @@ bool QtWin::isWindowPeekDisallowed(QWindow *window) \since 5.2 Sets the Flip3D policy \a policy for the specified \a window. + + \obsolete */ void QtWin::setWindowFlip3DPolicy(QWindow *window, QtWin::WindowFlip3DPolicy policy) { @@ -1612,12 +1660,16 @@ void QtWin::setWindowFlip3DPolicy(QWindow *window, QtWin::WindowFlip3DPolicy pol \fn QtWin::WindowFlip3DPolicy QtWin::windowFlip3DPolicy(QWidget *window) \since 5.2 \overload QtWin::windowFlip3DPolicy() + + \obsolete */ /*! \since 5.2 Returns the current Flip3D policy for the specified \a window. + + \obsolete */ QtWin::WindowFlip3DPolicy QtWin::windowFlip3DPolicy(QWindow *window) { @@ -1650,6 +1702,7 @@ void qt_ExtendFrameIntoClientArea(QWindow *window, int left, int top, int right, /*! \fn void QtWin::extendFrameIntoClientArea(QWidget *window, int left, int top, int right, int bottom) \since 5.2 \overload QtWin::extendFrameIntoClientArea() + \obsolete */ /*! @@ -1667,6 +1720,8 @@ void qt_ExtendFrameIntoClientArea(QWindow *window, int left, int top, int right, \note Qt::WA_NoSystemBackground must not be set on widgets for extendFrameIntoClientArea() to work. + \obsolete + \sa resetExtendedFrame() */ void QtWin::extendFrameIntoClientArea(QWindow *window, int left, int top, int right, int bottom) @@ -1681,6 +1736,8 @@ void QtWin::extendFrameIntoClientArea(QWindow *window, int left, int top, int ri Convenience overload that allows passing frame sizes in a \a margins structure. + + \obsolete */ /*! @@ -1689,6 +1746,8 @@ void QtWin::extendFrameIntoClientArea(QWindow *window, int left, int top, int ri Extends the glass frame into the client area of the specified \a window using the specified \a margins. + + \obsolete */ void QtWin::extendFrameIntoClientArea(QWindow *window, const QMargins &margins) { @@ -1699,6 +1758,8 @@ void QtWin::extendFrameIntoClientArea(QWindow *window, const QMargins &margins) \fn void QtWin::resetExtendedFrame(QWidget *window) \since 5.2 \overload QtWin::resetExtendedFrame() + + \obsolete */ /*! @@ -1712,6 +1773,8 @@ void QtWin::extendFrameIntoClientArea(QWindow *window, const QMargins &margins) \note Qt::WA_NoSystemBackground must not be set on widgets for extendFrameIntoClientArea() to work. + \obsolete + \sa extendFrameIntoClientArea() */ void QtWin::resetExtendedFrame(QWindow *window) @@ -1724,6 +1787,8 @@ void QtWin::resetExtendedFrame(QWindow *window) \fn void QtWin::enableBlurBehindWindow(QWidget *window, const QRegion ®ion) \since 5.2 \overload QtWin::enableBlurBehindWindow() + + \obsolete */ /*! @@ -1732,6 +1797,8 @@ void QtWin::resetExtendedFrame(QWindow *window) Enables the blur effect for the specified \a region of the specified \a window. + \obsolete + \sa disableBlurBehindWindow() */ void QtWin::enableBlurBehindWindow(QWindow *window, const QRegion ®ion) @@ -1758,6 +1825,8 @@ void QtWin::enableBlurBehindWindow(QWindow *window, const QRegion ®ion) \fn void QtWin::enableBlurBehindWindow(QWidget *window) \since 5.2 \overload QtWin::enableBlurBehindWindow() + + \obsolete */ /*! @@ -1765,6 +1834,8 @@ void QtWin::enableBlurBehindWindow(QWindow *window, const QRegion ®ion) Enables the blur effect for the specified \a window. + \obsolete + \sa disableBlurBehindWindow() */ void QtWin::enableBlurBehindWindow(QWindow *window) @@ -1776,6 +1847,8 @@ void QtWin::enableBlurBehindWindow(QWindow *window) \fn void QtWin::disableBlurBehindWindow(QWidget *window) \since 5.2 \overload QtWin::disableBlurBehindWindow() + + \obsolete */ /*! @@ -1783,6 +1856,8 @@ void QtWin::enableBlurBehindWindow(QWindow *window) Disables the previously enabled blur effect for the specified \a window. + \obsolete + \sa enableBlurBehindWindow() */ void QtWin::disableBlurBehindWindow(QWindow *window) @@ -1796,6 +1871,8 @@ void QtWin::disableBlurBehindWindow(QWindow *window) /*! \since 5.2 + \obsolete + Returns the DWM composition state. */ bool QtWin::isCompositionEnabled() @@ -1814,6 +1891,8 @@ bool QtWin::isCompositionEnabled() \note The underlying function was declared deprecated as of Windows 8 and takes no effect. + + \obsolete */ QT_WARNING_PUSH @@ -1831,6 +1910,8 @@ QT_WARNING_POP \since 5.2 Returns whether the colorization color is an opaque blend. + + \obsolete */ bool QtWin::isCompositionOpaque() { @@ -1847,6 +1928,8 @@ bool QtWin::isCompositionOpaque() For more information, see \l{http://msdn.microsoft.com/en-us/library/windows/desktop/dd378459.aspx} {Application User Model IDs}. + + \obsolete Use SetCurrentProcessExplicitAppUserModelID(id.toStdWString().c_str()) instead. */ void QtWin::setCurrentProcessExplicitAppUserModelID(const QString &id) { @@ -1890,6 +1973,8 @@ ITaskbarList2 *qt_createITaskbarList2() \fn void QtWin::markFullscreenWindow(QWidget *window, bool fullscreen) \since 5.2 \overload QtWin::markFullscreenWindow() + + \obsolete Use QWidget::showFullScreen() instead. */ /*! @@ -1902,6 +1987,8 @@ ITaskbarList2 *qt_createITaskbarList2() \note You do not usually need to call this function, because the Windows taskbar always tries to determine whether a window is running in the full-screen mode. + + \obsolete Use QWidget::showFullScreen() instead. */ void QtWin::markFullscreenWindow(QWindow *window, bool fullscreen) { @@ -1916,12 +2003,16 @@ void QtWin::markFullscreenWindow(QWindow *window, bool fullscreen) \fn void QtWin::taskbarActivateTab(QWidget *window) \since 5.2 \overload QtWin::taskbarActivateTab() + + \obsolete */ /*! \since 5.2 Activates an item on the taskbar without activating the \a window itself. + + \obsolete */ void QtWin::taskbarActivateTab(QWindow *window) { @@ -1936,6 +2027,8 @@ void QtWin::taskbarActivateTab(QWindow *window) \fn void QtWin::taskbarActivateTabAlt(QWidget *window) \since 5.2 \overload QtWin::taskbarActivateTabAlt() + + \obsolete */ /*! @@ -1943,6 +2036,8 @@ void QtWin::taskbarActivateTab(QWindow *window) Marks the item that represents the specified \a window on the taskbar as active, but does not activate it visually. + + \obsolete */ void QtWin::taskbarActivateTabAlt(QWindow *window) { @@ -1957,12 +2052,16 @@ void QtWin::taskbarActivateTabAlt(QWindow *window) \fn void QtWin::taskbarAddTab(QWidget *window) \since 5.2 \overload QtWin::taskbarAddTab() + + \obsolete */ /*! \since 5.2 Adds an item for the specified \a window to the taskbar. + + \obsolete */ void QtWin::taskbarAddTab(QWindow *window) { @@ -1977,12 +2076,16 @@ void QtWin::taskbarAddTab(QWindow *window) \fn void QtWin::taskbarDeleteTab(QWidget *window) \since 5.2 \overload QtWin::taskbarDeleteTab() + + \obsolete */ /*! \since 5.2 Removes the specified \a window from the taskbar. + + \obsolete */ void QtWin::taskbarDeleteTab(QWindow *window) { diff --git a/src/winextras/qwinjumplist.cpp b/src/winextras/qwinjumplist.cpp index 4032964..22a95ef 100644 --- a/src/winextras/qwinjumplist.cpp +++ b/src/winextras/qwinjumplist.cpp @@ -77,6 +77,7 @@ QT_BEGIN_NAMESPACE \inmodule QtWinExtras \brief The QWinJumpList class represents a transparent wrapper around Windows Jump Lists. + \obsolete \since 5.2 diff --git a/src/winextras/qwinjumplistcategory.cpp b/src/winextras/qwinjumplistcategory.cpp index 34fe371..815da31 100644 --- a/src/winextras/qwinjumplistcategory.cpp +++ b/src/winextras/qwinjumplistcategory.cpp @@ -68,6 +68,7 @@ QT_BEGIN_NAMESPACE \inmodule QtWinExtras \since 5.2 \brief The QWinJumpListCategory class represents a jump list category. + \obsolete */ /*! diff --git a/src/winextras/qwinjumplistitem.cpp b/src/winextras/qwinjumplistitem.cpp index 35d5fc8..23394e1 100644 --- a/src/winextras/qwinjumplistitem.cpp +++ b/src/winextras/qwinjumplistitem.cpp @@ -52,6 +52,7 @@ QT_BEGIN_NAMESPACE \inmodule QtWinExtras \since 5.2 \brief The QWinJumpListItem class represents a jump list item. + \obsolete */ /*! diff --git a/src/winextras/qwinmime.cpp b/src/winextras/qwinmime.cpp index 1499c5c..dc20510 100644 --- a/src/winextras/qwinmime.cpp +++ b/src/winextras/qwinmime.cpp @@ -51,6 +51,7 @@ QT_BEGIN_NAMESPACE \class QWinMime \inmodule QtWinExtras \brief The QWinMime class maps open-standard MIME to Window Clipboard formats. + \obsolete Qt's drag-and-drop and clipboard facilities use the MIME standard. On X11, this maps trivially to the Xdnd protocol, but on Windows diff --git a/src/winextras/qwintaskbarbutton.cpp b/src/winextras/qwintaskbarbutton.cpp index cadd2d5..8c7907b 100644 --- a/src/winextras/qwintaskbarbutton.cpp +++ b/src/winextras/qwintaskbarbutton.cpp @@ -61,6 +61,7 @@ QT_BEGIN_NAMESPACE \inmodule QtWinExtras \brief The QWinTaskbarButton class represents the Windows taskbar button for a top-level window (Windows 7 and newer). + \obsolete \since 5.2 diff --git a/src/winextras/qwintaskbarprogress.cpp b/src/winextras/qwintaskbarprogress.cpp index 635f09f..2c810bb 100644 --- a/src/winextras/qwintaskbarprogress.cpp +++ b/src/winextras/qwintaskbarprogress.cpp @@ -45,6 +45,7 @@ QT_BEGIN_NAMESPACE \class QWinTaskbarProgress \inmodule QtWinExtras \brief The QWinTaskbarProgress class represents a progress indicator in the Windows taskbar. + \obsolete \since 5.2 diff --git a/src/winextras/qwinthumbnailtoolbar.cpp b/src/winextras/qwinthumbnailtoolbar.cpp index 2c0032a..dd46515 100644 --- a/src/winextras/qwinthumbnailtoolbar.cpp +++ b/src/winextras/qwinthumbnailtoolbar.cpp @@ -84,6 +84,7 @@ static const int windowsLimitedThumbbarSize = 7; \inmodule QtWinExtras \since 5.2 \brief The QWinThumbnailToolBar class allows manipulating the thumbnail toolbar of a window. + \obsolete Applications can embed a toolbar in the thumbnail of a window, which is shown when hovering over its taskbar icon. A thumbnail toolbar may provide diff --git a/src/winextras/qwinthumbnailtoolbutton.cpp b/src/winextras/qwinthumbnailtoolbutton.cpp index 07de0b4..947ab45 100644 --- a/src/winextras/qwinthumbnailtoolbutton.cpp +++ b/src/winextras/qwinthumbnailtoolbutton.cpp @@ -48,6 +48,7 @@ QT_BEGIN_NAMESPACE \inmodule QtWinExtras \since 5.2 \brief The QWinThumbnailToolButton class represents a button in a thumbnail toolbar. + \obsolete Buttons in a QWinThumbnailToolBar are instances of QWinThumbnailToolButton. It provides a set of properties for specifying the attributes of a thumbnail -- cgit v1.2.3