diff options
author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-23 14:31:28 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-23 14:31:28 +0100 |
commit | 425b38ef95f6f4478ffbd4ada0d3046fae2c95e7 (patch) | |
tree | 0347dd701ace8ab022cf6c86edbb61be9795a668 /src/widgets/dialogs | |
parent | 2f2b78321427daa8c7f0702140c297d22b0bf3c8 (diff) | |
parent | 3b512ae142017f105f297467f74dc28d3cb9030a (diff) |
Merge "Merge master into api_changes" into refs/staging/api_changes
Diffstat (limited to 'src/widgets/dialogs')
-rw-r--r-- | src/widgets/dialogs/qdialog.cpp | 4 | ||||
-rw-r--r-- | src/widgets/dialogs/qmessagebox.cpp | 2 | ||||
-rw-r--r-- | src/widgets/dialogs/qwizard.cpp | 2 |
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 abdc0d3e65..f7125b7af1 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 } |