Merge remote-tracking branch 'origin/master' into api_changes

Conflicts:
	configure
	src/widgets/styles/qwindowsxpstyle.cpp
	tests/auto/gui/kernel/qwindow/qwindow.pro
	tests/auto/gui/kernel/qwindow/tst_qwindow.cpp

Change-Id: I624b6d26abce9874c610c04954c1c45bc074bef3

1 files changed, 21 insertions, 8 deletions

diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp
index 85f619db31..d65998ce49 100644
--- a/src/gui/kernel/qwindow.cpp
+++ b/src/gui/kernel/qwindow.cpp
@@ -375,6 +375,8 @@ bool QWindow::isTopLevel() const
     Returns whether the window is modal.
 
     A modal window prevents other windows from getting any input.
+
+    \sa QWindow::windowModality
 */
 bool QWindow::isModal() const
 {
@@ -382,26 +384,37 @@ bool QWindow::isModal() const
     return d->modality != Qt::NonModal;
 }
 
-/*!
-    Returns the window's modality.
+/*! \property QWindow::windowModality
+    \brief the modality of the window
+
+    A modal window prevents other windows from receiving input events. Qt
+    supports two types of modality: Qt::WindowModal and Qt::ApplicationModal.
 
-    \sa setWindowModality()
+    By default, this property is Qt::NonModal
+
+    \sa Qt::WindowModality
 */
+
 Qt::WindowModality QWindow::windowModality() const
 {
     Q_D(const QWindow);
     return d->modality;
 }
 
-/*!
-    Sets the window's modality to \a windowModality.
-*/
-void QWindow::setWindowModality(Qt::WindowModality windowModality)
+void QWindow::setWindowModality(Qt::WindowModality modality)
 {
     Q_D(QWindow);
-    d->modality = windowModality;
+    if (d->modality == modality)
+        return;
+    d->modality = modality;
+    emit windowModalityChanged(modality);
 }
 
+/*! \fn void QWindow::windowModalityChanged(Qt::WindowModality windowModality)
+
+    This signal is emitted when the Qwindow::windowModality property changes to \a windowModality.
+*/
+
 /*!
     Sets the window's surface \a format.