Commit e8cb9ecf authored by Friedemann Kleint's avatar Friedemann Kleint
Browse files

Compile fix MSVC / Qt 4.8 (QStringBuilder ambiguities).

parent e9298826
......@@ -634,11 +634,12 @@ void DesignModeWidget::setup()
openDocumentsWidget->setWindowTitle(tr("Open Documents"));
}
if (navigationView.widget)
navigationView.widget->setStyleSheet(QLatin1String(
Utils::FileReader::fetchQrc(":/qmldesigner/stylesheet.css")
+ Utils::FileReader::fetchQrc(":/qmldesigner/scrollbar.css")
+ "QLabel { background-color: #4f4f4f; }"));
if (navigationView.widget) {
QByteArray sheet = Utils::FileReader::fetchQrc(":/qmldesigner/stylesheet.css");
sheet += Utils::FileReader::fetchQrc(":/qmldesigner/scrollbar.css");
sheet += "QLabel { background-color: #4f4f4f; }";
navigationView.widget->setStyleSheet(QString::fromLatin1(sheet));
}
}
m_nodeInstanceView = new NodeInstanceView(this);
......
......@@ -42,9 +42,9 @@
StyledOutputpanePlaceHolder::StyledOutputpanePlaceHolder(Core::IMode *mode, QSplitter *parent) : Core::OutputPanePlaceHolder(mode, parent)
{
m_customStylesheet = QString::fromLatin1(
Utils::FileReader::fetchQrc(":/qmldesigner/outputpane-style.css")
+ Utils::FileReader::fetchQrc(":/qmldesigner/scrollbar.css"));
QByteArray sheet = Utils::FileReader::fetchQrc(":/qmldesigner/outputpane-style.css");
sheet += Utils::FileReader::fetchQrc(":/qmldesigner/scrollbar.css");
m_customStylesheet = QString::fromLatin1(sheet);
}
void StyledOutputpanePlaceHolder::childEvent(QChildEvent *event)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment