feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.0'

Browse Source 
Conflicts:
	src/plugins/coreplugin/find/findtoolbar.h

Change-Id: I7db695a28473d1b16c46b1e39a4d6fce537c13a1
This commit is contained in:
Eike Ziller
2016-03-16 15:28:47 +01:00
parent bcf7a11c24 6cecb7e4db
commit f1e14468c6
112 changed files with 1472 additions and 715 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmlprofiler/qmlprofilerstatewidget.cpp
View File

@@ -26,6 +26,7 @@
#include "qmlprofilerstatewidget.h"
#include <utils/qtcassert.h>
#include <utils/theme/theme.h>
#include <QPainter>
#include <QVBoxLayout>
@@ -162,8 +163,7 @@ void QmlProfilerStateWidget::paintEvent(QPaintEvent *event)
// Background
painter.setBrush(QColor("#E0E0E0"));
painter.setPen(QColor("#666666"));
painter.setBrush(Utils::creatorTheme()->color(Utils::Theme::BackgroundColorNormal));
painter.drawRoundedRect(QRect(borderWidth, 0, width()-2*borderWidth, height()-borderWidth), 6, 6);
// restore painter