Merge remote-tracking branch 'origin/4.9'

Change-Id: Ieed07c7fd0f422f8e1a96877c07916c7c1c1816e
This commit is contained in:
Eike Ziller
2019-02-11 14:50:08 +01:00
20 changed files with 139 additions and 44 deletions

View File

@@ -213,9 +213,7 @@ QmlProfilerTool::QmlProfilerTool()
this, &QmlProfilerTool::toggleVisibleFeature);
d->m_timeLabel = new QLabel();
QPalette palette;
palette.setColor(QPalette::WindowText, Qt::white);
d->m_timeLabel->setPalette(palette);
d->m_timeLabel->setProperty("panelwidget", true);
d->m_timeLabel->setIndent(10);
updateTimeDisplay();
connect(d->m_timeLabel, &QObject::destroyed, &d->m_recordingTimer, &QTimer::stop);