summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-11-16 03:00:05 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-11-16 03:00:06 +0100
commit622841e9271fb8f649a2290aaf1505f34aae88b3 (patch)
tree6a49f75933bcbf9778cbc2750bf62879ea49a738
parent1fca42ec752d9ff594f90a319456379196150b19 (diff)
parent3b07b8b2f33b0888e20313f52425012b980831c9 (diff)
Merge remote-tracking branch 'origin/5.14' into 5.15
-rw-r--r--src/activeqt/container/qaxwidget.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/activeqt/container/qaxwidget.cpp b/src/activeqt/container/qaxwidget.cpp
index d44cdf1..34dbe11 100644
--- a/src/activeqt/container/qaxwidget.cpp
+++ b/src/activeqt/container/qaxwidget.cpp
@@ -1971,6 +1971,8 @@ QAxWidget::~QAxWidget()
To initialize the control before it is activated, reimplement this
function and add your initialization code before you call
createHostWindow(true).
+
+ Returns \c true on success, \c false otherwise.
*/
bool QAxWidget::initialize(IUnknown **ptr)
{