aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-07-07 11:52:29 +0200
committerFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-07-08 14:22:40 +0000
commit1ce490ca9279d60ab404310fa00c91863b06c3ab (patch)
tree0c1ccaaf07bbc6d41e40c5a2427f4da1389b7a2c
parentcad43c1bf6d5438dce2ff2e0310713ce75e8ab40 (diff)
Improve documentation of QWinTaskbarButton::setWindow().
Mention that QWidget::windowHandle() may return 0 until the widget is shown. Task-number: QTBUG-47035 Change-Id: Ied8ceb6c1652f5f416a51dc6378599d5efe85420 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
-rw-r--r--src/winextras/doc/qtwinextras.qdocconf2
-rw-r--r--src/winextras/qwintaskbarbutton.cpp4
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.