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

Change-Id: Ic3ae0fd8c779c0bac8a0f01e87043251b3ce7fd4
This commit is contained in:
Tim Jenssen
2020-05-06 19:51:29 +02:00
125 changed files with 3878 additions and 558 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