Merge remote-tracking branch 'origin/2.7'

Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: Ie71d0d5aebdd1406d94de348bcd4cfcc203a1ba9

src/plugins/coreplugin/editormanager/editormanager.cpp

@@ -737,6 +737,7 @@ static void assignAction(QAction *self, QAction *other)
     self->setIcon(other->icon());
     self->setShortcut(other->shortcut());
     self->setEnabled(other->isEnabled());
+    self->setIconVisibleInMenu(other->isIconVisibleInMenu());
 }
 
 void EditorManager::addSaveAndCloseEditorActions(QMenu *contextMenu, const QModelIndex &editorIndex)

src/plugins/coreplugin/externaltool.cpp

@@ -319,7 +319,8 @@ static void localizedText(const QStringList &locales, QXmlStreamReader *reader,
     } else {
         if (*currentLocale < 0 && currentText->isEmpty()) {
             *currentText = QCoreApplication::translate("Core::Internal::ExternalTool",
-                                                       reader->readElementText().toUtf8().constData());
+                                                       reader->readElementText().toUtf8().constData(),
+                                                       "", QCoreApplication::UnicodeUTF8);
         } else {
             reader->skipCurrentElement();
         }

src/plugins/coreplugin/generalsettings.cpp

@@ -136,6 +136,7 @@ QWidget *GeneralSettings::createPage(QWidget *parent)
 
     m_page->autoSaveCheckBox->setChecked(EditorManager::instance()->autoSaveEnabled());
     m_page->autoSaveInterval->setValue(EditorManager::instance()->autoSaveInterval());
+    m_page->resetWarningsButton->setEnabled(Core::InfoBar::anyGloballySuppressed());
 
     connect(m_page->resetColorButton, SIGNAL(clicked()),
             this, SLOT(resetInterfaceColor()));
@@ -207,7 +208,7 @@ void GeneralSettings::resetInterfaceColor()
 void GeneralSettings::resetWarnings()
 {
     Core::InfoBar::clearGloballySuppressed();
-    QMessageBox::information(0, tr("Reset warnings"), tr("Done"));
+    m_page->resetWarningsButton->setEnabled(false);
 }
 
 void GeneralSettings::resetTerminal()

src/plugins/coreplugin/generalsettings.ui

@@ -109,6 +109,9 @@
       </item>
       <item row="3" column="0">
        <widget class="QPushButton" name="resetWarningsButton">
+        <property name="toolTip">
+         <string>Re-enable all warnings which were suppressed using &quot;Don't show again&quot; button (e.g. missing highlighter).</string>
+        </property>
         <property name="text">
          <string comment="Button text">Reset warnings</string>
         </property>

src/plugins/coreplugin/infobar.cpp

@@ -152,6 +152,11 @@ void InfoBar::clearGloballySuppressed()
     ICore::settings()->setValue(QLatin1String(C_SUPPRESSED_WARNINGS), QStringList());
 }
 
+bool InfoBar::anyGloballySuppressed()
+{
+    return !globallySuppressed.isEmpty();
+}
+
 
 InfoBarDisplay::InfoBarDisplay(QObject *parent)
     : QObject(parent)

src/plugins/coreplugin/infobar.h

@@ -89,6 +89,7 @@ public:
     static void globallySuppressInfo(Id id);
     static void initializeGloballySuppressed();
     static void clearGloballySuppressed();
+    static bool anyGloballySuppressed();
 
 signals:
     void changed();