diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-08-09 15:41:41 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-08-09 15:41:41 +0200 |
| commit | 2d447ab630bc4aa687ca6a5268f2f24ec568f522 (patch) | |
| tree | ffc2cb190ceb75ca18e089168f91785a027ac589 | |
| parent | 0f95e8d6d58592e2d98930bb6f097cf3bad26072 (diff) | |
| parent | 1ce490ca9279d60ab404310fa00c91863b06c3ab (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: Ia3b4a9a7812ef0a24023caf88410dadf4b333593
| -rw-r--r-- | src/winextras/doc/qtwinextras.qdocconf | 2 | ||||
| -rw-r--r-- | src/winextras/qwintaskbarbutton.cpp | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/winextras/doc/qtwinextras.qdocconf b/src/winextras/doc/qtwinextras.qdocconf index a0a31b5..27b991a 100644 --- a/src/winextras/doc/qtwinextras.qdocconf +++ b/src/winextras/doc/qtwinextras.qdocconf @@ -13,7 +13,7 @@ headerdirs = .. ../../imports/winextras sourcedirs = .. ../../imports/winextras imagedirs += images -depends += qtcore qtgui qtdoc +depends += qtcore qtgui qtdoc qtwidgets qhp.projects = QtWinExtras diff --git a/src/winextras/qwintaskbarbutton.cpp b/src/winextras/qwintaskbarbutton.cpp index 7150e1b..3bf0035 100644 --- a/src/winextras/qwintaskbarbutton.cpp +++ b/src/winextras/qwintaskbarbutton.cpp @@ -71,6 +71,10 @@ QT_BEGIN_NAMESPACE \snippet code/taskbar.cpp taskbar_cpp + \note QWidget::windowHandle() returns a valid instance of a QWindow only + after the widget has been shown. It is therefore recommended to delay the + initialization of the QWinTaskbarButton instances until QWidget::showEvent(). + \note The class wraps API only available since Windows 7. Instantiating it on Windows XP or Windows Vista causes a runtime warning. |