1 files changed, 54 insertions, 5 deletions
diff --git a/src/platformheaders/windowsfunctions/qwindowswindowfunctions.qdoc b/src/platformheaders/windowsfunctions/qwindowswindowfunctions.qdoc
index d6b8764e7b..24e4847042 100644
--- a/src/platformheaders/windowsfunctions/qwindowswindowfunctions.qdoc
+++ b/src/platformheaders/windowsfunctions/qwindowswindowfunctions.qdoc
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
@@ -11,8 +11,8 @@
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU Free Documentation License Usage
 ** Alternatively, this file may be used under the terms of the GNU Free
@@ -20,7 +20,7 @@
 ** Foundation and appearing in the file included in the packaging of
 ** this file. Please review the following information to ensure
 ** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -95,3 +95,52 @@
 
     See also \l [QtDoc] {Fullscreen OpenGL Based Windows}
 */
+
+/*!
+    \enum QWindowsWindowFunctions::WindowActivationBehavior
+
+    This enum specifies the behavior of QWidget::activateWindow() and
+    QWindow::requestActivate().
+
+    \value DefaultActivateWindow The window is activated according to the default
+        behavior of the Windows operating system. This means the window will not
+        be activated in some circumstances (most notably when the calling process
+        is not the active process); only the taskbar entry will be flashed.
+    \value AlwaysActivateWindow  The window is always activated, even when the
+        calling process is not the active process.
+
+    \sa QWidget::activateWindow(), QWindow::requestActivate()
+    \since 5.7
+*/
+
+/*!
+    \typedef QWindowsWindowFunctions::SetWindowActivationBehaviorType
+
+    This is the typedef for the function returned by QGuiApplication::platformFunction()
+    when passed setWindowActivationBehaviorIdentifier().
+
+    \sa QWidget::activateWindow(), QWindow::requestActivate()
+    \since 5.7
+*/
+
+/*!
+    \fn QByteArray setWindowActivationBehaviorIdentifier()
+
+    This function returns a bytearray that can be used to query
+    QGuiApplication::platformFunction() to retrieve the SetWindowActivationBehaviorType
+    function.
+
+    \sa QWidget::activateWindow(), QWindow::requestActivate()
+    \since 5.7
+*/
+
+/*!
+    \fn void QWindowsWindowFunctions::setWindowActivationBehavior(WindowActivationBehavior behavior)
+
+    This is a convenience function that can be used directly instead of resolving
+    the function pointer. \a behavior will be relayed to the function retrieved
+    by QGuiApplication.
+
+    \sa QWidget::activateWindow(), QWindow::requestActivate()
+    \since 5.7
+*/