Merge remote-tracking branch 'origin/4.0'

 Conflicts:
	src/libs/utils/tcpportsgatherer.h

Change-Id: I495f3e05789f09efb8b1e84827893423a5b5b60c

1 files changed, 6 insertions, 3 deletions

diff --git a/src/plugins/coreplugin/progressmanager/progressbar.cpp b/src/plugins/coreplugin/progressmanager/progressbar.cpp
index a1c3fcbd91..1348196893 100644
--- a/src/plugins/coreplugin/progressmanager/progressbar.cpp
+++ b/src/plugins/coreplugin/progressmanager/progressbar.cpp
@@ -244,11 +244,14 @@ void ProgressBar::paintEvent(QPaintEvent *)
     // Draw separator
     int separatorHeight = m_separatorVisible ? SEPARATOR_HEIGHT : 0;
     if (m_separatorVisible) {
+        QRectF innerRect = QRectF(this->rect()).adjusted(0.5, 0.5, -0.5, -0.5);
         p.setPen(StyleHelper::sidebarShadow());
-        p.drawLine(0,0, size().width(), 0);
+        p.drawLine(innerRect.topLeft(), innerRect.topRight());
 
-        p.setPen(StyleHelper::sidebarHighlight());
-        p.drawLine(1, 1, size().width(), 1);
+        if (creatorTheme()->flag(Theme::DrawToolBarHighlights)) {
+            p.setPen(StyleHelper::sidebarHighlight());
+            p.drawLine(innerRect.topLeft() + QPointF(1, 1), innerRect.topRight() + QPointF(0, 1));
+        }
     }
 
     if (m_titleVisible) {