Merge nsNativeThemeQt.cpp

widget/src/qt/nsNativeThemeQt.cpp

@@ -338,6 +338,7 @@ nsNativeThemeQt::GetWidgetPadding(nsIDeviceContext* ,
         aResult->SizeTo(2, 2, 2, 2);
         return PR_TRUE;
     }
+
     return PR_FALSE;
 }
 
@@ -396,13 +397,18 @@ nsNativeThemeQt::GetMinimumWidgetSize(nsIRenderingContext* aContext, nsIFrame* a
         break;
     }
     case NS_THEME_SCROLLBAR_BUTTON_UP:
-    case NS_THEME_SCROLLBAR_BUTTON_DOWN:
-    case NS_THEME_SCROLLBAR_BUTTON_LEFT:
-    case NS_THEME_SCROLLBAR_BUTTON_RIGHT: {
+    case NS_THEME_SCROLLBAR_BUTTON_DOWN: {
         (*aResult).width = s->pixelMetric(QStyle::PM_ScrollBarExtent);
         (*aResult).height = (*aResult).width;
         //*aIsOverridable = PR_FALSE;
         break;
+    }
+    case NS_THEME_SCROLLBAR_BUTTON_LEFT:
+    case NS_THEME_SCROLLBAR_BUTTON_RIGHT: {
+        (*aResult).height = s->pixelMetric(QStyle::PM_ScrollBarExtent);
+        (*aResult).width = (*aResult).height;
+        //*aIsOverridable = PR_FALSE;
+        break;
         }
     case NS_THEME_SCROLLBAR_THUMB_VERTICAL: {
         (*aResult).width = s->pixelMetric(QStyle::PM_ScrollBarExtent);
@@ -462,7 +468,6 @@ nsNativeThemeQt::GetMinimumWidgetSize(nsIRenderingContext* aContext, nsIFrame* a
         break;
     }
     case NS_THEME_DROPDOWN_TEXT: {
-        qDebug("---");
         QStyleOptionComboBox comboOpt;
         
         nsRect frameRect = aFrame->GetRect();