Merge master into api_changes

Change-Id: I93551e4d13a1b0815b359b9415060e9089477db1

3 files changed, 4 insertions, 4 deletions

diff --git a/src/widgets/dialogs/qdialog.cpp b/src/widgets/dialogs/qdialog.cpp
index 5d36bc07e8..df76d0af0e 100644
--- a/src/widgets/dialogs/qdialog.cpp
+++ b/src/widgets/dialogs/qdialog.cpp
@@ -754,7 +754,7 @@ void QDialog::setVisible(bool visible)
         }
 
 #ifndef QT_NO_ACCESSIBILITY
-        QAccessibleEvent event(QAccessible::DialogStart, this);
+        QAccessibleEvent event(this, QAccessible::DialogStart);
         QAccessible::updateAccessibility(&event);
 #endif
 
@@ -764,7 +764,7 @@ void QDialog::setVisible(bool visible)
 
 #ifndef QT_NO_ACCESSIBILITY
         if (isVisible()) {
-            QAccessibleEvent event(QAccessible::DialogEnd, this);
+            QAccessibleEvent event(this, QAccessible::DialogEnd);
             QAccessible::updateAccessibility(&event);
         }
 #endif
diff --git a/src/widgets/dialogs/qmessagebox.cpp b/src/widgets/dialogs/qmessagebox.cpp
index 040f61dfc5..ec24f09b77 100644
--- a/src/widgets/dialogs/qmessagebox.cpp
+++ b/src/widgets/dialogs/qmessagebox.cpp
@@ -1463,7 +1463,7 @@ void QMessageBox::showEvent(QShowEvent *e)
     d->updateSize();
 
 #ifndef QT_NO_ACCESSIBILITY
-    QAccessibleEvent event(QAccessible::Alert, this);
+    QAccessibleEvent event(this, QAccessible::Alert);
     QAccessible::updateAccessibility(&event);
 #endif
 #ifdef Q_OS_WIN
diff --git a/src/widgets/dialogs/qwizard.cpp b/src/widgets/dialogs/qwizard.cpp
index 8a75353c86..ac19ec8d22 100644
--- a/src/widgets/dialogs/qwizard.cpp
+++ b/src/widgets/dialogs/qwizard.cpp
@@ -573,7 +573,7 @@ public:
         }
 #if !defined(QT_NO_STYLE_WINDOWSVISTA)
         if (QSysInfo::WindowsVersion >= QSysInfo::WV_VISTA
-            && QSysInfo::WindowsVersion < QSysInfo::WV_NT_based)
+            && (QSysInfo::WindowsVersion & QSysInfo::WV_NT_based))
             vistaInitPending = true;
 #endif
     }