Merge remote-tracking branch 'origin/4.0'

Change-Id: If0ba896a083392a532f76bb26bec3540a7c17667

src/plugins/autotest/testtreemodel.cpp

@@ -638,7 +638,7 @@ void TestTreeModel::markForRemoval(const QString &filePath)
                 for ( ; grandChildRow >= 0; --grandChildRow) {
                     TestTreeItem *grandChild = child->childItem(grandChildRow);
                     if (grandChild->filePath() == filePath) {
-                        grandChild->markForRemoval(true);
+                        grandChild->markForRemovalRecursively(true);
                     }
                 }
             }

src/plugins/coreplugin/fileiconprovider.cpp

@@ -155,11 +155,10 @@ QIcon icon(QFileIconProvider::IconType type)
   */
 QPixmap overlayIcon(const QPixmap &baseIcon, const QIcon &overlayIcon)
 {
-    QPixmap iconPixmap = baseIcon;
-    QPainter painter(&iconPixmap);
-    painter.drawPixmap(0, 0, overlayIcon.pixmap(baseIcon.size()));
-    painter.end();
-    return iconPixmap;
+    QPixmap result = baseIcon;
+    QPainter painter(&result);
+    overlayIcon.paint(&painter, QRect(QPoint(), result.size() / result.devicePixelRatio()));
+    return result;
 }
 
 /*!

src/plugins/debugger/debuggerruncontrol.cpp

@@ -116,7 +116,7 @@ DebuggerRunControl::DebuggerRunControl(RunConfiguration *runConfig, DebuggerEngi
       m_engine(engine),
       m_running(false)
 {
-    setIcon(ProjectExplorer::Icons::DEBUG_START_SMALL);
+    setIcon(ProjectExplorer::Icons::DEBUG_START_SMALL_TOOLBAR);
     connect(this, &RunControl::finished, this, &DebuggerRunControl::handleFinished);
 
     connect(engine, &DebuggerEngine::requestRemoteSetup,

src/plugins/designer/designer.pro

@@ -46,6 +46,4 @@ equals(TEST, 1) {
     DEFINES += SRCDIR=\\\"$$PWD\\\"
 }
 
-RESOURCES += designer.qrc
-
 DISTFILES += README.txt

src/plugins/designer/designer.qbs

@@ -29,7 +29,6 @@ QtcPlugin {
         files: [
             "README.txt",
             "codemodelhelpers.cpp", "codemodelhelpers.h",
-            "designer.qrc",
             "designer_export.h",
             "designerconstants.h",
             "designercontext.cpp", "designercontext.h",

src/plugins/designer/formeditorfactory.cpp

@@ -29,6 +29,7 @@
 
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/fileiconprovider.h>
+#include <projectexplorer/projectexplorerconstants.h>
 
 #include <QCoreApplication>
 #include <QDebug>
@@ -45,7 +46,7 @@ FormEditorFactory::FormEditorFactory()
     setDisplayName(qApp->translate("Designer", C_DESIGNER_XML_DISPLAY_NAME));
     addMimeType(FORM_MIMETYPE);
 
-    FileIconProvider::registerIconOverlayForSuffix(":/formeditor/images/qt_ui.png", "ui");
+    FileIconProvider::registerIconOverlayForSuffix(ProjectExplorer::Constants::FILEOVERLAY_UI, "ui");
 }
 
 IEditor *FormEditorFactory::createEditor()

src/plugins/projectexplorer/appoutputpane.cpp

@@ -180,7 +180,7 @@ AppOutputPane::AppOutputPane() :
     // Attach
     m_attachButton->setToolTip(msgAttachDebuggerTooltip());
     m_attachButton->setEnabled(false);
-    m_attachButton->setIcon(Icons::DEBUG_START_SMALL.icon());
+    m_attachButton->setIcon(Icons::DEBUG_START_SMALL_TOOLBAR.icon());
     m_attachButton->setAutoRaise(true);
 
     connect(m_attachButton, &QAbstractButton::clicked,

src/plugins/projectexplorer/projectexplorer.qrc

@@ -69,5 +69,21 @@
         <file>images/targetchangebutton2@2x.png</file>
         <file>images/desktopdevice.png</file>
         <file>images/desktopdevice@2x.png</file>
+        <file>images/fileoverlay_qml.png</file>
+        <file>images/fileoverlay_qml@2x.png</file>
+        <file>images/fileoverlay_qrc.png</file>
+        <file>images/fileoverlay_qrc@2x.png</file>
+        <file>images/fileoverlay_qt.png</file>
+        <file>images/fileoverlay_qt@2x.png</file>
+        <file>images/fileoverlay_ui.png</file>
+        <file>images/fileoverlay_ui@2x.png</file>
+        <file>images/fileoverlay_scxml.png</file>
+        <file>images/fileoverlay_scxml@2x.png</file>
+        <file>images/fileoverlay_cpp.png</file>
+        <file>images/fileoverlay_cpp@2x.png</file>
+        <file>images/fileoverlay_h.png</file>
+        <file>images/fileoverlay_h@2x.png</file>
+        <file>images/fileoverlay_unknown.png</file>
+        <file>images/fileoverlay_unknown@2x.png</file>
     </qresource>
 </RCC>

src/plugins/projectexplorer/projectexplorerconstants.h

@@ -265,5 +265,15 @@ const char DEBUG_RUN_MODE_WITH_BREAK_ON_MAIN[]="RunConfiguration.DebugRunModeWit
 // Navigation Widget
 const char PROJECTTREE_ID[] = "Projects";
 
+// File icon overlays
+const char FILEOVERLAY_QT[]=":/projectexplorer/images/fileoverlay_qt.png";
+const char FILEOVERLAY_QML[]=":/projectexplorer/images/fileoverlay_qml.png";
+const char FILEOVERLAY_UI[]=":/projectexplorer/images/fileoverlay_ui.png";
+const char FILEOVERLAY_QRC[]=":/projectexplorer/images/fileoverlay_qrc.png";
+const char FILEOVERLAY_CPP[]=":/projectexplorer/images/fileoverlay_cpp.png";
+const char FILEOVERLAY_H[]=":/projectexplorer/images/fileoverlay_h.png";
+const char FILEOVERLAY_SCXML[]=":/projectexplorer/images/fileoverlay_scxml.png";
+const char FILEOVERLAY_UNKNOWN[]=":/projectexplorer/images/fileoverlay_unknown.png";
+
 } // namespace Constants
 } // namespace ProjectExplorer

src/plugins/qbsprojectmanager/qbsnodes.cpp

@@ -809,7 +809,7 @@ bool QbsProjectNode::showInSimpleTree() const
 void QbsProjectNode::ctor()
 {
     if (m_projectIcon.isNull())
-        m_projectIcon = generateIcon(QString::fromLatin1(QtSupport::Constants::ICON_QT_PROJECT));
+        m_projectIcon = generateIcon(QString::fromLatin1(ProjectExplorer::Constants::FILEOVERLAY_QT));
 
     setIcon(m_projectIcon);
     addFileNodes(QList<ProjectExplorer::FileNode *>()

src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp

@@ -94,7 +94,7 @@ bool QbsProjectManagerPlugin::initialize(const QStringList &arguments, QString *
 
     const Core::Context projectContext(::QbsProjectManager::Constants::PROJECT_ID);
 
-    Core::FileIconProvider::registerIconOverlayForSuffix(QtSupport::Constants::ICON_QT_PROJECT, "qbs");
+    Core::FileIconProvider::registerIconOverlayForSuffix(ProjectExplorer::Constants::FILEOVERLAY_QT, "qbs");
 
     //create and register objects
     addAutoReleasedObject(new QbsManager);

src/plugins/qmakeprojectmanager/profileeditor.cpp

@@ -35,6 +35,7 @@
 #include <coreplugin/fileiconprovider.h>
 #include <extensionsystem/pluginmanager.h>
 #include <qtsupport/qtsupportconstants.h>
+#include <projectexplorer/projectexplorerconstants.h>
 #include <texteditor/texteditoractionhandler.h>
 #include <texteditor/textdocument.h>
 #include <utils/qtcassert.h>
@@ -201,7 +202,7 @@ ProFileEditorFactory::ProFileEditorFactory()
     addHoverHandler(new ProFileHoverHandler(keywords));
     setSyntaxHighlighterCreator([keywords]() { return new ProFileHighlighter(keywords); });
 
-    const QString defaultOverlay = QLatin1String(QtSupport::Constants::ICON_QT_PROJECT);
+    const QString defaultOverlay = QLatin1String(ProjectExplorer::Constants::FILEOVERLAY_QT);
     Core::FileIconProvider::registerIconOverlayForSuffix(
                 creatorTheme()->imageFile(Theme::IconOverlayPro, defaultOverlay).toLatin1().data(), "pro");
     Core::FileIconProvider::registerIconOverlayForSuffix(

src/plugins/qmakeprojectmanager/qmakenodes.cpp

@@ -32,6 +32,7 @@
 
 #include <projectexplorer/nodesvisitor.h>
 #include <projectexplorer/projectexplorer.h>
+#include <projectexplorer/projectexplorerconstants.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/editormanager/ieditor.h>
 #include <coreplugin/fileiconprovider.h>
@@ -94,19 +95,19 @@ struct FileTypeDataStorage {
 
 static const FileTypeDataStorage fileTypeDataStorage[] = {
     { HeaderType, Theme::ProjectExplorerHeader, QT_TRANSLATE_NOOP("QmakeProjectManager::QmakePriFileNode", "Headers"),
-      ":/qmakeprojectmanager/images/headers.png", "*.h; *.hh; *.hpp; *.hxx;"},
+      ProjectExplorer::Constants::FILEOVERLAY_H, "*.h; *.hh; *.hpp; *.hxx;"},
     { SourceType, Theme::ProjectExplorerSource, QT_TRANSLATE_NOOP("QmakeProjectManager::QmakePriFileNode", "Sources"),
-      ":/qmakeprojectmanager/images/sources.png", "*.c; *.cc; *.cpp; *.cp; *.cxx; *.c++;" },
+      ProjectExplorer::Constants::FILEOVERLAY_CPP, "*.c; *.cc; *.cpp; *.cp; *.cxx; *.c++;" },
     { FormType, Theme::ProjectExplorerForm, QT_TRANSLATE_NOOP("QmakeProjectManager::QmakePriFileNode", "Forms"),
-      ":/qtsupport/images/forms.png", "*.ui;" },
+      Constants::FILEOVERLAY_UI, "*.ui;" },
     { StateChartType, Theme::ProjectExplorerForm, QT_TRANSLATE_NOOP("QmakeProjectManager::QmakePriFileNode", "State charts"),
-      ":/qtsupport/images/statecharts.png", "*.scxml;" },
+      ProjectExplorer::Constants::FILEOVERLAY_SCXML, "*.scxml;" },
     { ResourceType, Theme::ProjectExplorerResource, QT_TRANSLATE_NOOP("QmakeProjectManager::QmakePriFileNode", "Resources"),
-      ":/qtsupport/images/qt_qrc.png", "*.qrc;" },
+      ProjectExplorer::Constants::FILEOVERLAY_QRC, "*.qrc;" },
     { QMLType, Theme::ProjectExplorerQML, QT_TRANSLATE_NOOP("QmakeProjectManager::QmakePriFileNode", "QML"),
-      ":/qtsupport/images/qml.png", "*.qml; *.qml.ui" },
+      ProjectExplorer::Constants::FILEOVERLAY_QML, "*.qml;" },
     { UnknownFileType, Theme::ProjectExplorerOtherFiles, QT_TRANSLATE_NOOP("QmakeProjectManager::QmakePriFileNode", "Other files"),
-      ":/qmakeprojectmanager/images/unknown.png", "*;" }
+      ProjectExplorer::Constants::FILEOVERLAY_UNKNOWN, "*;" }
 };
 
 class SortByPath
@@ -171,7 +172,7 @@ QmakeNodeStaticData::QmakeNodeStaticData()
     }
     // Project icon
     const QString fileName = creatorTheme()->imageFile(Theme::ProjectFileIcon,
-                                                       QLatin1String(":/qtsupport/images/qt_project.png"));
+                                                       QLatin1String(ProjectExplorer::Constants::FILEOVERLAY_QT));
     const QIcon projectBaseIcon(fileName);
     const QPixmap projectPixmap = FileIconProvider::overlayIcon(dirPixmap, projectBaseIcon);
     projectIcon.addPixmap(projectPixmap);

src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs

@@ -69,18 +69,6 @@ QtcPlugin {
         ]
     }
 
-    Group {
-        name: "Images"
-        prefix: "images/"
-        files: [
-            "headers.png",
-            "run_qmake.png",
-            "run_qmake_small.png",
-            "sources.png",
-            "unknown.png",
-        ]
-    }
-
     Group {
         name: "Wizards"
         prefix: "wizards/"

src/plugins/qmakeprojectmanager/qmakeprojectmanager.qrc

@@ -1,11 +1,6 @@
 <RCC>
     <qresource prefix="/qmakeprojectmanager">
-        <file>images/run_qmake.png</file>
-        <file>images/run_qmake_small.png</file>
         <file>QmakeProjectManager.mimetypes.xml</file>
-        <file>images/headers.png</file>
-        <file>images/sources.png</file>
-        <file>images/unknown.png</file>
         <file>images/dark_headers.png</file>
         <file>images/dark_sources.png</file>
         <file>images/dark_unknown.png</file>

src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.cpp

@@ -332,6 +332,7 @@ void QMLRewriter::dump(const ASTPath &path)
 {
     qDebug() << "AST path with" << path.size() << "node(s):";
     for (int i = 0; i < path.size(); ++i) {
-        qDebug() << qPrintable(QString(i + 1, QLatin1Char('-'))) << typeid(*path.at(i)).name();
+        auto node = path.at(i);
+        qDebug().noquote() << QString(i + 1, QLatin1Char('-')) << typeid(*node).name();
     }
 }

src/plugins/qmljseditor/qmljseditor.pro

@@ -61,8 +61,6 @@ SOURCES += \
     qmljswrapinloader.cpp \
     qmljseditordocument.cpp
 
-RESOURCES += qmljseditor.qrc
-
 FORMS += \
     quicktoolbarsettingspage.ui \
     qmljscomponentnamedialog.ui

src/plugins/qmljseditor/qmljseditor.qbs

@@ -28,7 +28,6 @@ QtcPlugin {
         "qmljscomponentnamedialog.ui",
         "qmljseditor.cpp",
         "qmljseditor.h",
-        "qmljseditor.qrc",
         "qmljseditor_global.h",
         "qmljseditorconstants.h",
         "qmljseditordocument.cpp",
@@ -72,7 +71,6 @@ QtcPlugin {
         "quicktoolbarsettingspage.cpp",
         "quicktoolbarsettingspage.h",
         "quicktoolbarsettingspage.ui",
-        "images/qmlfile.png",
     ]
 
     Export {

src/plugins/qmljseditor/qmljseditor.qrc

@@ -1,5 +0,0 @@
-<RCC>
-    <qresource prefix="/qmljseditor">
-        <file>images/qmlfile.png</file>
-    </qresource>
-</RCC>

src/plugins/qmljseditor/qmljseditorplugin.cpp

@@ -50,6 +50,7 @@
 #include <coreplugin/actionmanager/command.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <projectexplorer/taskhub.h>
+#include <projectexplorer/projectexplorerconstants.h>
 #include <texteditor/texteditorconstants.h>
 #include <utils/qtcassert.h>
 #include <utils/json.h>
@@ -186,7 +187,7 @@ bool QmlJSEditorPlugin::initialize(const QStringList & /*arguments*/, QString *e
 
     errorMessage->clear();
 
-    FileIconProvider::registerIconOverlayForSuffix(":/qmljseditor/images/qmlfile.png", "qml");
+    FileIconProvider::registerIconOverlayForSuffix(ProjectExplorer::Constants::FILEOVERLAY_QML, "qml");
 
     registerQuickFixes(this);
 

src/plugins/qtsupport/qtsupport.qbs

@@ -102,11 +102,6 @@ QtcPlugin {
         "showbuildlog.ui",
         "uicgenerator.cpp",
         "uicgenerator.h",
-        "images/forms.png",
-        "images/qml.png",
-        "images/qt_project.png",
-        "images/qt_qrc.png",
-        "images/statecharts.png",
     ]
 
     Group {

src/plugins/qtsupport/qtsupport.qrc

@@ -1,10 +1,5 @@
 <RCC>
     <qresource prefix="/qtsupport">
-        <file>images/forms.png</file>
-        <file>images/statecharts.png</file>
-        <file>images/qml.png</file>
-        <file>images/qt_project.png</file>
-        <file>images/qt_qrc.png</file>
         <file>images/dark_forms.png</file>
         <file>images/dark_qml.png</file>
         <file>images/dark_qt_project.png</file>

src/plugins/qtsupport/qtsupportconstants.h

@@ -58,8 +58,5 @@ const char FEATURE_QT_CONSOLE[] = "QtSupport.Wizards.FeatureQtConsole";
 const char FEATURE_MOBILE[] = "QtSupport.Wizards.FeatureMobile";
 const char FEATURE_DESKTOP[] = "QtSupport.Wizards.FeatureDesktop";
 
-// Icon:
-const char ICON_QT_PROJECT[] = ":/qtsupport/images/qt_project.png";
-
 } // namepsace Constants
 } // namepsace QtSupport

src/plugins/resourceeditor/qrceditor/resourcefile.cpp

@@ -30,6 +30,7 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/removefiledialog.h>
 #include <coreplugin/vcsmanager.h>
+#include <projectexplorer/projectexplorerconstants.h>
 #include <utils/fileutils.h>
 
 #include <QCoreApplication>
@@ -547,7 +548,7 @@ ResourceModel::ResourceModel(QObject *parent)
     : QAbstractItemModel(parent), m_dirty(false)
 {
     m_prefixIcon = Core::FileIconProvider::overlayIcon(QStyle::SP_DirIcon,
-        QIcon(QLatin1String(":/resourceeditor/images/qt_qrc.png")), QSize(16, 16));
+        QIcon(QLatin1String(ProjectExplorer::Constants::FILEOVERLAY_QRC)), QSize(16, 16));
 }
 
 void ResourceModel::setDirty(bool b)

src/plugins/resourceeditor/resourceeditor.qrc

@@ -1,6 +1,5 @@
 <RCC>
     <qresource prefix="/resourceeditor">
-        <file>images/qt_qrc.png</file>
         <file>ResourceEditor.mimetypes.xml</file>
     </qresource>
 </RCC>

src/plugins/resourceeditor/resourceeditorfactory.cpp

@@ -30,6 +30,7 @@
 
 #include <coreplugin/fileiconprovider.h>
 #include <coreplugin/editormanager/editormanager.h>
+#include <projectexplorer/projectexplorerconstants.h>
 
 #include <QCoreApplication>
 #include <QFileInfo>
@@ -46,7 +47,8 @@ ResourceEditorFactory::ResourceEditorFactory(ResourceEditorPlugin *plugin) :
     setMimeTypes(QStringList(QLatin1String(C_RESOURCE_MIMETYPE)));
     setDisplayName(qApp->translate("OpenWith::Editors", C_RESOURCEEDITOR_DISPLAY_NAME));
 
-    Core::FileIconProvider::registerIconOverlayForSuffix(":/resourceeditor/images/qt_qrc.png", "qrc");
+    Core::FileIconProvider::registerIconOverlayForSuffix(
+                ProjectExplorer::Constants::FILEOVERLAY_QRC, "qrc");
 }
 
 Core::IEditor *ResourceEditorFactory::createEditor()

src/plugins/updateinfo/updateinfoplugin.cpp

@@ -33,6 +33,7 @@
 #include <coreplugin/settingsdatabase.h>
 #include <coreplugin/shellcommand.h>
 #include <utils/fileutils.h>
+#include <utils/synchronousprocess.h>
 
 #include <QDate>
 #include <QDomDocument>
@@ -60,6 +61,13 @@ using namespace Core;
 namespace UpdateInfo {
 namespace Internal {
 
+class IgnoreExitCode : public Utils::ExitCodeInterpreter
+{
+public:
+    IgnoreExitCode(QObject *parent);
+    Utils::SynchronousProcessResponse::Result interpretExitCode(int code) const override;
+};
+
 class UpdateInfoPluginPrivate
 {
 public:
@@ -76,6 +84,16 @@ public:
     QDate m_lastCheckDate;
 };
 
+IgnoreExitCode::IgnoreExitCode(QObject *parent)
+    : Utils::ExitCodeInterpreter(parent)
+{
+}
+
+Utils::SynchronousProcessResponse::Result IgnoreExitCode::interpretExitCode(int code) const
+{
+    Q_UNUSED(code)
+    return Utils::SynchronousProcessResponse::Finished;
+}
 
 UpdateInfoPlugin::UpdateInfoPlugin()
     : d(new UpdateInfoPluginPrivate)
@@ -123,10 +141,13 @@ void UpdateInfoPlugin::startCheckForUpdates()
 {
     stopCheckForUpdates();
 
-    d->m_checkUpdatesCommand = new ShellCommand(QString(), QProcessEnvironment());
+    QProcessEnvironment env;
+    env.insert(QLatin1String("QT_LOGGING_RULES"), QLatin1String("*=false"));
+    d->m_checkUpdatesCommand = new ShellCommand(QString(), env);
     connect(d->m_checkUpdatesCommand, &ShellCommand::stdOutText, this, &UpdateInfoPlugin::collectCheckForUpdatesOutput);
     connect(d->m_checkUpdatesCommand, &ShellCommand::finished, this, &UpdateInfoPlugin::checkForUpdatesFinished);
-    d->m_checkUpdatesCommand->addJob(Utils::FileName(QFileInfo(d->m_maintenanceTool)), QStringList(QLatin1String("--checkupdates")));
+    d->m_checkUpdatesCommand->addJob(Utils::FileName(QFileInfo(d->m_maintenanceTool)), QStringList(QLatin1String("--checkupdates")),
+                                     /*workingDirectory=*/QString(), new IgnoreExitCode(d->m_checkUpdatesCommand));
     d->m_checkUpdatesCommand->execute();
     emit checkForUpdatesRunningChanged(true);
 }

src/tools/clangbackend/ipcsource/clangtranslationunit.cpp

@@ -417,7 +417,9 @@ void TranslationUnit::checkTranslationUnitErrorCode(CXErrorCode errorCode) const
 {
     switch (errorCode) {
         case CXError_Success: break;
-        default: throw TranslationUnitParseErrorException(d->filePath, d->projectPart.projectPartId());
+        default: throw TranslationUnitParseErrorException(d->filePath,
+                                                          d->projectPart.projectPartId(),
+                                                          errorCode);
     }
 }
 

src/tools/clangbackend/ipcsource/translationunitparseerrorexception.cpp

@@ -27,9 +27,13 @@
 
 namespace ClangBackEnd {
 
-TranslationUnitParseErrorException::TranslationUnitParseErrorException(const Utf8String &filePath, const Utf8String &projectPartId)
+TranslationUnitParseErrorException::TranslationUnitParseErrorException(
+        const Utf8String &filePath,
+        const Utf8String &projectPartId,
+        CXErrorCode errorCode)
     : filePath_(filePath),
-      projectPartId_(projectPartId)
+      projectPartId_(projectPartId),
+      errorCode_(errorCode)
 {
 }
 
@@ -43,14 +47,31 @@ const Utf8String &TranslationUnitParseErrorException::projectPartId() const
     return projectPartId_;
 }
 
+#define RETURN_TEXT_FOR_CASE(enumValue) case enumValue: return #enumValue
+static const char *errorCodeToText(CXErrorCode errorCode)
+{
+    switch (errorCode) {
+        RETURN_TEXT_FOR_CASE(CXError_Success);
+        RETURN_TEXT_FOR_CASE(CXError_Failure);
+        RETURN_TEXT_FOR_CASE(CXError_Crashed);
+        RETURN_TEXT_FOR_CASE(CXError_InvalidArguments);
+        RETURN_TEXT_FOR_CASE(CXError_ASTReadError);
+    }
+
+    return "UnknownCXErrorCode";
+}
+#undef RETURN_TEXT_FOR_CASE
+
 const char *TranslationUnitParseErrorException::what() const Q_DECL_NOEXCEPT
 {
-    if (what_.isEmpty())
+    if (what_.isEmpty()) {
         what_ += Utf8StringLiteral("Parse error for file ")
                 + filePath()
                 + Utf8StringLiteral(" in project ")
                 + projectPartId()
-                + Utf8StringLiteral("!");
+                + Utf8StringLiteral(": ")
+                + Utf8String::fromUtf8(errorCodeToText(errorCode_));
+    }
 
     return what_.constData();
 }

src/tools/clangbackend/ipcsource/translationunitparseerrorexception.h

@@ -27,6 +27,8 @@
 
 #include <utf8string.h>
 
+#include <clang-c/Index.h>
+
 #include <exception>
 
 namespace ClangBackEnd {
@@ -34,7 +36,9 @@ namespace ClangBackEnd {
 class TranslationUnitParseErrorException : public std::exception
 {
 public:
-    TranslationUnitParseErrorException(const Utf8String &filePath, const Utf8String &projectPartId);
+    TranslationUnitParseErrorException(const Utf8String &filePath,
+                                       const Utf8String &projectPartId,
+                                       CXErrorCode errorCode);
 
     const Utf8String &filePath() const;
     const Utf8String &projectPartId() const;
@@ -50,6 +54,7 @@ public:
 private:
     Utf8String filePath_;
     Utf8String projectPartId_;
+    CXErrorCode errorCode_;
     mutable Utf8String what_;
 };
 

src/tools/icons/qtcreatoricons.svg

@@ -5048,6 +5048,343 @@
        transform="matrix(0.5,0,0,0.5,285,189.5)"
        width="100%"
        height="100%" />
+    <g
+       id="src/plugins/projectexplorer/images/fileoverlay_qt">
+      <rect
+         y="520"
+         x="64"
+         height="16"
+         width="16"
+         id="rect4941"
+         style="opacity:1;fill:none;fill-opacity:1;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <g
+         id="g5823"
+         transform="translate(1,1)">
+        <path
+           sodipodi:nodetypes="ccccccc"
+           inkscape:connector-curvature="0"
+           id="path5089-5"
+           d="m 78,532.5 -1.5,1.5 -6.5,0 0,-4.5 1.5,-1.5 6.5,0 z"
+           style="opacity:0.75;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           sodipodi:nodetypes="ccccccc"
+           inkscape:connector-curvature="0"
+           id="path5089"
+           d="m 78,532.5 -1.5,1.5 -6.5,0 0,-4.5 1.5,-1.5 6.5,0 z"
+           style="opacity:1;fill:#17a81a;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <g
+           id="g4959"
+           style="stroke-width:0.89999998;stroke-miterlimit:4;stroke-dasharray:none;stroke:#ffffff;stroke-opacity:1"
+           transform="translate(-2,-2)">
+          <path
+             sodipodi:nodetypes="zzzzz"
+             inkscape:connector-curvature="0"
+             id="path4945"
+             d="m 74.5,531.5 c 1,0 1,0.28518 1,1.5 0,1.21481 0,1.5 -1,1.5 -1,0 -1,-0.30273 -1,-1.5 0,-1.19726 0,-1.5 1,-1.5 z"
+             style="opacity:1;fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+          <path
+             sodipodi:nodetypes="cc"
+             inkscape:connector-curvature="0"
+             id="path4953"
+             d="m 75.309359,534.5 1.198874,1.38951"
+             style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+          <path
+             sodipodi:nodetypes="ccc"
+             inkscape:connector-curvature="0"
+             id="path4955"
+             d="m 77.515625,530.95312 -0.02268,2.94133 c 0.0017,0.96521 0.838372,0.77673 1.507055,0.60555"
+             style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+          <path
+             sodipodi:nodetypes="cc"
+             inkscape:connector-curvature="0"
+             id="path4957"
+             d="m 76.5,532.5 2.5,0"
+             style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        </g>
+      </g>
+    </g>
+    <g
+       id="src/plugins/projectexplorer/images/fileoverlay_qrc"
+       transform="translate(1,1)">
+      <rect
+         style="opacity:1;fill:none;fill-opacity:1;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect4941-3"
+         width="16"
+         height="16"
+         x="79"
+         y="519" />
+      <path
+         id="rect5803-6"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.75;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m 88.5,526 c -1.359054,0 -2.5,1.14095 -2.5,2.5 l 0,4 c 0,1.35905 1.140946,2.5 2.5,2.5 l 4,0 c 1.359054,0 2.5,-1.14095 2.5,-2.5 l 0,-4 c 0,-1.35905 -1.140946,-2.5 -2.5,-2.5 l -4,0 z m 0.5,3 3,0 0,3 -3,0 0,-3 z m 5,-2 c 0,-1.5 -1,-3 -2.5,-3 l -2,0 c -1.5,0 -2.5,1.5 -2.5,3 z" />
+      <rect
+         ry="1"
+         y="527.5"
+         x="87.5"
+         height="6"
+         width="6"
+         id="rect5803"
+         style="opacity:1;fill:#c8ab37;fill-opacity:1;stroke:#502d16;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="csccsc"
+         inkscape:connector-curvature="0"
+         id="path5807"
+         d="m 90.5,527.5 c 0,-1.55365 0.479803,-2 1,-2 0.5,0 1,0.55365 1,2 l -4,0 c 0,-1.47787 0.5,-2 1,-2 0.5,0 1,0.47787 1,2 z"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#502d16;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path5809"
+         d="m 87.5,530.5 6,0"
+         style="fill:none;fill-rule:evenodd;stroke:#502d16;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path5811"
+         d="m 90.5,527.5 0,6"
+         style="fill:none;fill-rule:evenodd;stroke:#502d16;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
+    <g
+       id="src/plugins/projectexplorer/images/fileoverlay_ui">
+      <rect
+         style="opacity:1;fill:none;fill-opacity:1;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect4941-3-5"
+         width="16"
+         height="16"
+         x="96"
+         y="520" />
+      <g
+         id="g5054"
+         transform="translate(0,2)">
+        <path
+           sodipodi:nodetypes="cccccc"
+           inkscape:connector-curvature="0"
+           id="path5052"
+           d="m 103.5,533 -3.5,1 1,-3.5 8.5,-8.5 2.5,2.5 z"
+           style="opacity:0.75;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           style="fill:#bb6000;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 109,526.5 -1.5,-1.5 -6,6 -0.5,2 2,-0.5 z"
+           id="path4998" />
+        <path
+           style="fill:#bb6000;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 108,524.5 1.5,-1.5 1.46016,1.39987 L 109.5,526 Z"
+           id="path5037" />
+      </g>
+    </g>
+    <g
+       transform="translate(16,0)"
+       id="src/plugins/projectexplorer/images/fileoverlay_qml">
+      <rect
+         style="opacity:1;fill:none;fill-opacity:1;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect4941-3-5-0"
+         width="16"
+         height="16"
+         x="96"
+         y="520" />
+      <path
+         style="opacity:0.75;fill:#ffffff;fill-opacity:1;fill-rule:evenodd"
+         d="m 101,534 c 0,2 0.5,2 1.5,2 1,0 1.5,0 1.5,-1 l 6,0 c 1,0 2,-1 2,-2 l 0,-4.01441 C 112,528 111.87906,527 110.43953,527 109,527 109,528 109,529 l -8,0 c -4,0 -4,5 0,5 z"
+         id="path5194"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="czcccczccc" />
+      <g
+         id="g5186"
+         style="stroke:#1986a0;stroke-opacity:1"
+         transform="translate(0,1)">
+        <path
+           sodipodi:nodetypes="cc"
+           inkscape:connector-curvature="0"
+           id="path5120"
+           d="m 102.5,529 0,5"
+           style="fill:none;fill-rule:evenodd;stroke:#1986a0;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           sodipodi:nodetypes="cc"
+           inkscape:connector-curvature="0"
+           id="path5120-5"
+           d="m 104.5,529 0,4"
+           style="fill:none;fill-rule:evenodd;stroke:#1986a0;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           sodipodi:nodetypes="ccc"
+           inkscape:connector-curvature="0"
+           id="path5154"
+           d="m 104.5,530.5 c 0,-1 2,-1.5 2,0 l 0,2.5"
+           style="fill:none;fill-rule:evenodd;stroke:#1986a0;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           sodipodi:nodetypes="ccc"
+           inkscape:connector-curvature="0"
+           id="path5154-1"
+           d="m 106.5,530.5 c 0,-1 2,-1.5 2,0 l 0,2.5"
+           style="fill:none;fill-rule:evenodd;stroke:#1986a0;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           sodipodi:nodetypes="cc"
+           inkscape:connector-curvature="0"
+           id="path5120-8"
+           d="m 110.5,527 0,6"
+           style="fill:none;fill-rule:evenodd;stroke:#1986a0;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           style="fill:none;fill-rule:evenodd;stroke:#1986a0;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 102.5,531.5 0,-2 c -1.00971,-0.17314 -2.927822,-0.45188 -3,1 -0.07218,1.45188 2,1 3,1 z"
+           id="path5210"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cczc" />
+      </g>
+    </g>
+    <g
+       transform="translate(32,0)"
+       id="src/plugins/projectexplorer/images/fileoverlay_h">
+      <rect
+         style="opacity:1;fill:none;fill-opacity:1;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect4941-3-5-0-5"
+         width="16"
+         height="16"
+         x="96"
+         y="520" />
+      <path
+         style="opacity:0.75;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 104,533.5 0,-5 c 0,-1 0.69468,-1.48115 1.5,-1.5 0.80532,-0.0189 1.5,0.5 1.5,1.5 l 0,0.5 c 1.5,0 3,0.18403 3,2.5 0,0.5 0,1.12627 0,2 0,1 -0.5,1.5 -1.5,1.5 l -3,0 c -1,0 -1.5,-0.5 -1.5,-1.5 z"
+         id="path5897"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cczccscccc" />
+      <g
+         id="g5186-9"
+         style="stroke:#e31212;stroke-opacity:1"
+         transform="translate(-1.5,1)">
+        <path
+           sodipodi:nodetypes="ccc"
+           inkscape:connector-curvature="0"
+           id="path5154-12"
+           d="m 107,530.5 c 0,-1 3,-1.5 3,0 l 0,2.5"
+           style="fill:none;fill-rule:evenodd;stroke:#e31212;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           sodipodi:nodetypes="cc"
+           inkscape:connector-curvature="0"
+           id="path5120-8-8"
+           d="m 107,527 0,6"
+           style="fill:none;fill-rule:evenodd;stroke:#e31212;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      </g>
+    </g>
+    <g
+       transform="translate(48,0)"
+       id="src/plugins/projectexplorer/images/fileoverlay_cpp">
+      <rect
+         style="opacity:1;fill:none;fill-opacity:1;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect4941-3-5-0-5-4"
+         width="16"
+         height="16"
+         x="96"
+         y="520" />
+      <path
+         style="opacity:0.75;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 105,527 c -2,0 -4,1 -4,4 0,3 2,4 4,4 2,0 2,-1 2,-1 0,0 1,0 2.5,0 1.5,0 2.5,-1.32149 2.5,-2.5 0,-1.17851 -1,-2.5 -2.5,-2.5 -1.5,0 -2.5,0 -2.5,0 0,0 0,-2 -2,-2 z"
+         id="path5937"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="zzzczzzcz" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#2e5e84;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 106,528.5 c -2.5,0 -3.5,0.5 -3.5,2.5 0,2 1,2.5 3.5,2.5"
+         id="path5929"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="czc" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#2e5e84;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 106,531.5 5,0"
+         id="path5931"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#2e5e84;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 107.5,530 0,3"
+         id="path5933"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#2e5e84;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 109.5,530 0,3"
+         id="path5935"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+    </g>
+    <g
+       id="src/plugins/projectexplorer/images/fileoverlay_unknown">
+      <rect
+         y="520"
+         x="160"
+         height="16"
+         width="16"
+         id="rect6843"
+         style="opacity:1;fill:none;fill-opacity:1;stroke:none;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         style="opacity:0.75;fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 166,527 3,0 0,-2 3,0 3,3 0,5 -3,0 0,2 -6,0 z"
+         id="path6852"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccccccc" />
+      <use
+         height="100%"
+         width="100%"
+         transform="translate(3,-2)"
+         id="use6840"
+         xlink:href="#unknowndocumentsheet"
+         y="0"
+         x="0" />
+      <g
+         inkscape:label="#g6836"
+         id="unknowndocumentsheet">
+        <path
+           style="fill:#e6e6e6;fill-rule:evenodd;stroke:#4d4d4d;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 169,527.5 2.5,2.5 0,4.5 -5,0 0,-7 z"
+           id="path6832"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccccc" />
+        <path
+           style="fill:none;fill-rule:evenodd;stroke:#4d4d4d;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 168.5,527.5 0,3 3,0"
+           id="path6834"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccc" />
+      </g>
+    </g>
+    <g
+       id="src/plugins/projectexplorer/images/fileoverlay_scxml">
+      <rect
+         style="opacity:1;fill:none;fill-opacity:1;stroke:none;stroke-linejoin:miter;stroke-opacity:1"
+         id="rect6843-2"
+         width="16"
+         height="16"
+         x="176"
+         y="520" />
+      <path
+         sodipodi:nodetypes="zzzcccccccccccz"
+         inkscape:connector-curvature="0"
+         id="path6902"
+         d="m 180,526.5 c 0,-1.5 1,-2.5 2.5,-2.5 1.5,0 2.5,1 2.5,2.5 0,1.5 -1,2 -1,2 l 0,0.5 4,0 c 1.5,0 2,0.5 2,2 l 0,3 c 0,1 -0.5,2 -2,2 l -3,0 c -1.5,0 -2,-0.5 -2,-2 l 0,-1 c -1,0 -2,-0.5 -2,-1.5 l 0,-3 c 0,0 -1,-0.5 -1,-2 z"
+         style="opacity:0.75;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <g
+         transform="matrix(-1,0,0,1,370,0)"
+         id="g6897">
+        <path
+           style="fill:none;fill-opacity:0.74901961;fill-rule:evenodd;stroke:#808080;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 187.5,527 0,5.5 -2,0"
+           id="path6889"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccc" />
+        <rect
+           style="opacity:1;fill:none;fill-opacity:1;stroke:#4d4d4d;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="rect6885"
+           width="4"
+           height="4"
+           x="181.5"
+           y="530.5"
+           ry="1.25" />
+        <circle
+           style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="path6895"
+           cx="187.5"
+           cy="526.5"
+           r="1.5" />
+      </g>
+    </g>
     <g
        id="src/plugins/coreplugin/images/filesave">
       <rect