Merge remote-tracking branch 'origin/3.6'

Change-Id: Iddfa0d2f3c0fb8ba65c0e5d479ad8e2f2cb95685

src/plugins/coreplugin/mainwindow.cpp

@@ -240,6 +240,16 @@ void MainWindow::setOverrideColor(const QColor &color)
     m_overrideColor = color;
 }
 
+QStringList MainWindow::additionalAboutInformation() const
+{
+    return m_aboutInformation;
+}
+
+void MainWindow::appendAboutInformation(const QString &line)
+{
+    m_aboutInformation.append(line);
+}
+
 MainWindow::~MainWindow()
 {
     // explicitly delete window support, because that calls methods from ICore that call methods