Merge remote-tracking branch 'origin/4.12' into qds-1.50

Change-Id: Ib971309305e4955a582f85de17e2e2c3365b0e92
This commit is contained in:
Tim Jenssen
2020-05-05 21:00:19 +02:00
43 changed files with 583 additions and 304 deletions

View File

@@ -316,7 +316,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