Merge remote-tracking branch 'origin/4.12'

Change-Id: I11936ad9e4515c3c6c9df1d949cc8116aeccd4c4
This commit is contained in:
Eike Ziller
2020-05-06 09:43:20 +02:00
22 changed files with 310 additions and 208 deletions

View File

@@ -309,7 +309,7 @@ void DesignModeWidget::setup()
// Apply stylesheet to QWidget
QByteArray sheet = Utils::FileReader::fetchQrc(":/qmldesigner/stylesheet.css");
sheet += Utils::FileReader::fetchQrc(":/qmldesigner/scrollbar.css");
sheet += "QLabel { background-color: #4f4f4f; }";
sheet += "QLabel { background-color: creatorTheme.DSsectionHeadBackground; }";
navigationView.widget->setStyleSheet(Theme::replaceCssColors(QString::fromUtf8(sheet)));
// Create DockWidget