From 926d7f46f5acee39e96aed2c27da50a96f0e2c5f Mon Sep 17 00:00:00 2001
From: Ivan Komissarov <ABBAPOH@gmail.com>
Date: Sat, 26 Apr 2014 14:34:25 +0400
Subject: Fixed wrong condition in QMacStyle.

Change-Id: I003e59bd50754dbbda23de5c55096ca2d25b7a7a
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
---
 src/widgets/styles/qmacstyle_mac.mm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/widgets/styles/qmacstyle_mac.mm')

diff --git a/src/widgets/styles/qmacstyle_mac.mm b/src/widgets/styles/qmacstyle_mac.mm
index 42262e66a9..174e1dabfa 100644
--- a/src/widgets/styles/qmacstyle_mac.mm
+++ b/src/widgets/styles/qmacstyle_mac.mm
@@ -5319,7 +5319,7 @@ void QMacStyle::drawComplexControl(ComplexControl cc, const QStyleOptionComplex
         if (const QStyleOptionComboBox *combo = qstyleoption_cast<const QStyleOptionComboBox *>(opt)){
             HIThemeButtonDrawInfo bdi;
             d->initComboboxBdi(combo, &bdi, widget, d->getDrawState(opt->state));
-            if (!tds == kThemeStateInactive)
+            if (tds != kThemeStateInactive)
                 QMacStylePrivate::drawCombobox(qt_hirectForQRect(combo->rect), bdi, p);
             else
                 d->drawColorlessButton(qt_hirectForQRect(combo->rect), &bdi, p, opt);
-- 
cgit v1.2.3


From f230223aef8990ec172f825de8444f67f6d1aa6f Mon Sep 17 00:00:00 2001
From: Jake Petroules <jake.petroules@petroules.com>
Date: Thu, 8 May 2014 00:54:21 -0400
Subject: Remove trailing whitespace.

Change-Id: Id487c8951d7f258c57fa71fd35a60ddb8c5a3fb2
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/widgets/styles/qmacstyle_mac.mm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/widgets/styles/qmacstyle_mac.mm')

diff --git a/src/widgets/styles/qmacstyle_mac.mm b/src/widgets/styles/qmacstyle_mac.mm
index 174e1dabfa..e165b8aa68 100644
--- a/src/widgets/styles/qmacstyle_mac.mm
+++ b/src/widgets/styles/qmacstyle_mac.mm
@@ -1696,7 +1696,7 @@ QMacStylePrivate::QMacStylePrivate()
     if (ptrHIShapeGetBounds == 0) {
         QLibrary library(QLatin1String("/System/Library/Frameworks/Carbon.framework/Carbon"));
         library.setLoadHints(QLibrary::ExportExternalSymbolsHint);
-		ptrHIShapeGetBounds = reinterpret_cast<PtrHIShapeGetBounds>(library.resolve("HIShapeGetBounds"));
+        ptrHIShapeGetBounds = reinterpret_cast<PtrHIShapeGetBounds>(library.resolve("HIShapeGetBounds"));
     }
 
 }
-- 
cgit v1.2.3