From 99ff142fcf320664fe63f85d9f6b861e58392c56 Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@digia.com>
Date: Mon, 26 Nov 2012 14:29:46 +0100
Subject: [PATCH] Mac: Fix wheel event handling on 10.6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change "else" case to support compiling on 10.7+
and deploying on 10.6

Task-number: QTBUG-28060
Change-Id: Iaaeaaefe98083863ed750c7cb320db02e16543af
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
---
 src/plugins/platforms/cocoa/qnsview.mm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/plugins/platforms/cocoa/qnsview.mm b/src/plugins/platforms/cocoa/qnsview.mm
index 8e18ca37087..68117824dbb 100644
--- a/src/plugins/platforms/cocoa/qnsview.mm
+++ b/src/plugins/platforms/cocoa/qnsview.mm
@@ -665,12 +665,12 @@ static QTouchDevice *touchDevice = 0;
         if (phase == NSEventPhaseEnded || phase == NSEventPhaseCancelled) {
             currentWheelModifiers = Qt::NoModifier;
         }
-    }
-#else
-    QWindowSystemInterface::handleWheelEvent(m_window, qt_timestamp, qt_windowPoint, qt_windowPoint, pixelDelta, angleDelta,
-                                             [self convertKeyModifiers:[theEvent modifierFlags]]);
+    } else
 #endif
-
+    {
+        QWindowSystemInterface::handleWheelEvent(m_window, qt_timestamp, qt_windowPoint, qt_windowPoint, pixelDelta, angleDelta,
+                                                 [self convertKeyModifiers:[theEvent modifierFlags]]);
+    }
 }
 #endif //QT_NO_WHEELEVENT