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/kernel/qwhatsthis.cpp | |
| parent | 2f2b78321427daa8c7f0702140c297d22b0bf3c8 (diff) | |
| parent | 3b512ae142017f105f297467f74dc28d3cb9030a (diff) | |
Merge "Merge master into api_changes" into refs/staging/api_changes
Diffstat (limited to 'src/widgets/kernel/qwhatsthis.cpp')
| -rw-r--r-- | src/widgets/kernel/qwhatsthis.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/widgets/kernel/qwhatsthis.cpp b/src/widgets/kernel/qwhatsthis.cpp index 114cde59e9..9d3493dc8a 100644 --- a/src/widgets/kernel/qwhatsthis.cpp +++ b/src/widgets/kernel/qwhatsthis.cpp @@ -291,7 +291,7 @@ void QWhatsThat::paintEvent(QPaintEvent*) bool drawShadow = true; #if defined(Q_WS_WIN) if ((QSysInfo::WindowsVersion >= QSysInfo::WV_XP - && QSysInfo::WindowsVersion < QSysInfo::WV_NT_based)) + && (QSysInfo::WindowsVersion & QSysInfo::WV_NT_based))) { BOOL shadow; SystemParametersInfo(SPI_GETDROPSHADOW, 0, &shadow, 0); @@ -412,7 +412,7 @@ QWhatsThisPrivate::QWhatsThisPrivate() #endif } #ifndef QT_NO_ACCESSIBILITY - QAccessibleEvent event(QAccessible::ContextHelpStart, this); + QAccessibleEvent event(this, QAccessible::ContextHelpStart); QAccessible::updateAccessibility(&event); #endif } @@ -425,7 +425,7 @@ QWhatsThisPrivate::~QWhatsThisPrivate() QApplication::restoreOverrideCursor(); #endif #ifndef QT_NO_ACCESSIBILITY - QAccessibleEvent event(QAccessible::ContextHelpEnd, this); + QAccessibleEvent event(this, QAccessible::ContextHelpEnd); QAccessible::updateAccessibility(&event); #endif instance = 0; |