Merge "Merge branch 'dev' into stable" into refs/staging/stable

1 files changed, 11 insertions, 11 deletions

diff --git a/tests/auto/other/macgui/guitest.cpp b/tests/auto/other/macgui/guitest.cpp
index d4af5c1386..93e9db9a61 100644
--- a/tests/auto/other/macgui/guitest.cpp
+++ b/tests/auto/other/macgui/guitest.cpp
@@ -118,10 +118,10 @@ QAccessibleInterface *WidgetNavigator::recursiveSearch(TestBase *test, QAccessib
 
     while (todoInterfaces.isEmpty() == false) {
         QAccessibleInterface *testInterface = todoInterfaces.pop();
-        
+
         if ((*test)(testInterface))
             return testInterface;
-            
+
         const int numChildren = testInterface->childCount();
         for (int i = 0; i < numChildren; ++i) {
             QAccessibleInterface *childInterface = testInterface->child(i);
@@ -160,17 +160,17 @@ namespace NativeEvents {
         CGPoint position;
         position.x = globalPos.x();
         position.y = globalPos.y();
-       
+
         const bool updateMousePosition = (updateMouse == UpdatePosition);
-        
+
         // Mouse down.
-        CGPostMouseEvent(position, updateMousePosition, 3, 
-                        (buttons & Qt::LeftButton) ? true : false, 
-                        (buttons & Qt::MidButton/* Middlebutton! */) ? true : false, 
+        CGPostMouseEvent(position, updateMousePosition, 3,
+                        (buttons & Qt::LeftButton) ? true : false,
+                        (buttons & Qt::MidButton/* Middlebutton! */) ? true : false,
                         (buttons & Qt::RightButton) ? true : false);
 
         // Mouse up.
-        CGPostMouseEvent(position, updateMousePosition, 3, false, false, false);	
+        CGPostMouseEvent(position, updateMousePosition, 3, false, false, false);
     }
 #else
 # error Oops, NativeEvents::mouseClick() is not implemented on this platform.
@@ -200,7 +200,7 @@ bool checkPixel(QColor pixel, QColor expected)
 }
 
 /*
-    Tests that the pixels inside rect in image all have the given color. 
+    Tests that the pixels inside rect in image all have the given color.
 */
 bool GuiTester::isFilled(const QImage image, const QRect &rect, const QColor &color)
 {
@@ -218,7 +218,7 @@ bool GuiTester::isFilled(const QImage image, const QRect &rect, const QColor &co
 
 /*
     Tests that stuff is painted to the pixels inside rect.
-    This test fails if any lines in the given direction have pixels 
+    This test fails if any lines in the given direction have pixels
     of only one color.
 */
 bool GuiTester::isContent(const QImage image, const QRect &rect, Directions directions)
@@ -239,7 +239,7 @@ bool GuiTester::isContent(const QImage image, const QRect &rect, Directions dire
             }
         }
         return true;
-    } 
+    }
 
     if (directions & Vertical) {
        for (int x = rect.left(); x <= rect.right(); ++x) {