diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-15 09:10:52 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-15 09:10:52 +0200 |
commit | d9a0197149916273baa498508f10a26891444d21 (patch) | |
tree | f274d3ec1ceb897dfa6b7b001d6a305ccf9dd65d | |
parent | e333bc68a1ba83bf881d9f599251ee3b7df3b984 (diff) | |
parent | 63dfce20f95b4dc47b4f650be924415bdb9a5705 (diff) |
Merge remote-tracking branch 'origin/5.4' into 5.5v5.5.0-beta1
Change-Id: Ic1f50d8d646e53f6a5629db98fcaa7a1a99d8b4f
-rw-r--r-- | src/winextras/qwintaskbarbutton.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/winextras/qwintaskbarbutton.cpp b/src/winextras/qwintaskbarbutton.cpp index f0be30a..7150e1b 100644 --- a/src/winextras/qwintaskbarbutton.cpp +++ b/src/winextras/qwintaskbarbutton.cpp @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE \class QWinTaskbarButton \inmodule QtWinExtras \brief The QWinTaskbarButton class represents the Windows taskbar button for - a window. + a top-level window (Windows 7 and newer). \since 5.2 @@ -71,6 +71,9 @@ QT_BEGIN_NAMESPACE \snippet code/taskbar.cpp taskbar_cpp + \note The class wraps API only available since Windows 7. Instantiating it + on Windows XP or Windows Vista causes a runtime warning. + \sa QWinTaskbarProgress */ @@ -104,7 +107,8 @@ QWinTaskbarButtonPrivate::QWinTaskbarButtonPrivate() : progressBar(0), pTbList(0 QWinTaskbarButtonPrivate::~QWinTaskbarButtonPrivate() { - pTbList->Release(); + if (pTbList) + pTbList->Release(); } HWND QWinTaskbarButtonPrivate::handle() |