Merge remote-tracking branch 'origin/3.6'

Change-Id: Iddfa0d2f3c0fb8ba65c0e5d479ad8e2f2cb95685
This commit is contained in:
Eike Ziller
2015-10-26 10:55:45 +01:00
285 changed files with 6092 additions and 2844 deletions

View File

@@ -257,7 +257,6 @@ QList<QWidget *> CompileOutputWindow::toolBarWidgets() const
void CompileOutputWindow::appendText(const QString &text, BuildStep::OutputFormat format)
{
using Utils::Theme;
QPalette p = m_outputWindow->palette();
Theme *theme = Utils::creatorTheme();
QTextCharFormat textFormat;
switch (format) {