summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@digia.com>2012-09-27 10:43:44 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-09-27 14:59:13 +0200
commit0189315c8c990a53db4579b2c8b1f36e14d9555c (patch)
tree59cb29f7ed220edb7993cc5af0a89f17139e8f8f /src
parente86e49f02e88f2ee64eff4a22e21d41835ae33e2 (diff)
WindowsPlugin: Fix MinGW warnings
Fix warnings: Change-Id: Ia68607f72087c0085e528fee0e6270b80692e389 warning: enumeration value 'SynthesizeMouseFromTouchEvents' not handled in switch warning: suggest parentheses around assignment used as truth value Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/platforms/windows/qwindowscontext.cpp5
-rw-r--r--src/plugins/platforms/windows/qwindowsintegration.cpp1
2 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/platforms/windows/qwindowscontext.cpp b/src/plugins/platforms/windows/qwindowscontext.cpp
index 99dfcf421a..a9102ff920 100644
--- a/src/plugins/platforms/windows/qwindowscontext.cpp
+++ b/src/plugins/platforms/windows/qwindowscontext.cpp
@@ -555,8 +555,9 @@ QWindowsWindow *QWindowsContext::findClosestPlatformWindow(HWND hwnd) const
// Find the closest parent that has a platform window.
if (!window) {
for (HWND w = hwnd; w; w = GetParent(w)) {
- if (window = d->m_windows.value(w))
- return window;
+ window = d->m_windows.value(w);
+ if (window)
+ break;
}
}
diff --git a/src/plugins/platforms/windows/qwindowsintegration.cpp b/src/plugins/platforms/windows/qwindowsintegration.cpp
index baf306b41a..463e01246b 100644
--- a/src/plugins/platforms/windows/qwindowsintegration.cpp
+++ b/src/plugins/platforms/windows/qwindowsintegration.cpp
@@ -428,6 +428,7 @@ QVariant QWindowsIntegration::styleHint(QPlatformIntegration::StyleHint hint) co
case QPlatformIntegration::ShowIsFullScreen:
case QPlatformIntegration::PasswordMaskDelay:
case QPlatformIntegration::StartDragVelocity:
+ case QPlatformIntegration::SynthesizeMouseFromTouchEvents:
break; // Not implemented
case QPlatformIntegration::FontSmoothingGamma:
return QVariant(QWindowsFontDatabase::fontSmoothingGamma());