Merge remote-tracking branch 'origin/4.4'

 Conflicts:
	src/plugins/debugger/debuggerdialogs.cpp
	src/plugins/debugger/gdb/remotegdbserveradapter.cpp

Change-Id: I1ae77869887a8d9ef2a33439f2733315db9e0cf0

share/qtcreator/debugger/dumper.py

@@ -1177,7 +1177,7 @@ class DumperBase:
         n = arrayByteSize // innerType.size()
         p = value.address()
         if displayFormat != RawFormat and p:
-            if innerType.name in ('char', 'wchar_t', 'unsigned char', 'signed char'):
+            if innerType.name in ('char', 'wchar_t', 'unsigned char', 'signed char', 'CHAR', 'WCHAR'):
                 self.putCharArrayHelper(p, n, innerType, self.currentItemFormat(),
                                         makeExpandable = False)
             else:
@@ -1256,7 +1256,7 @@ class DumperBase:
     # This is shared by pointer and array formatting.
     def tryPutSimpleFormattedPointer(self, ptr, typeName, innerType, displayFormat, limit):
         if displayFormat == AutomaticFormat:
-            if innerType.name in ('char', 'signed char', 'unsigned char'):
+            if innerType.name in ('char', 'signed char', 'unsigned char', 'CHAR'):
                 # Use UTF-8 as default for char *.
                 self.putType(typeName)
                 (elided, shown, data) = self.readToFirstZero(ptr, 1, limit)
@@ -1265,7 +1265,7 @@ class DumperBase:
                     self.putArrayData(ptr, shown, innerType)
                 return True
 
-            if innerType.name == 'wchar_t':
+            if innerType.name in ('wchar_t', 'WCHAR'):
                 self.putType(typeName)
                 charSize = self.lookupType('wchar_t').size()
                 (elided, data) = self.encodeCArray(ptr, charSize, limit)
@@ -1415,7 +1415,7 @@ class DumperBase:
         #warn('INNER: %s' % innerType.name)
         if self.autoDerefPointers:
             # Generic pointer type with AutomaticFormat, but never dereference char types:
-            if innerType.name not in ('char', 'signed char', 'unsigned char', 'wchar_t'):
+            if innerType.name not in ('char', 'signed char', 'unsigned char', 'wchar_t', 'CHAR', 'WCHAR'):
                 self.putDerefedPointer(value)
                 return
 

share/qtcreator/debugger/gdbbridge.py

@@ -1062,6 +1062,11 @@ class Dumper(DumperBase):
             cmd = 'set variable (%s)=%s' % (expr, value)
             gdb.execute(cmd)
 
+    def appendSolibSearchPath(self, args):
+        new = list(map(self.hexdecode, args['path']))
+        old = [gdb.parameter('solib-search-path')]
+        gdb.execute('set solib-search-path %s' % args['separator'].join(old + new))
+
     def watchPoint(self, args):
         self.reportToken(args)
         ns = self.qtNamespace()

src/libs/3rdparty/cplusplus/Keywords.cpp

@@ -255,8 +255,8 @@ static inline int classify5(const char *s, LanguageFeatures features)
       }
     }
   }
-  else if (features.cxxEnabled && s[0] == 'f') {
-    if (s[1] == 'a') {
+  else if (s[0] == 'f') {
+    if (features.cxxEnabled && s[1] == 'a') {
       if (s[2] == 'l') {
         if (s[3] == 's') {
           if (s[4] == 'e') {

src/libs/3rdparty/cplusplus/Symbols.cpp

@@ -106,7 +106,11 @@ Declaration::Declaration(Clone *clone, Subst *subst, Declaration *original)
     , _initializer(clone->stringLiteral(original->_initializer))
 {
     const char* nameId = nullptr;
-    if (const Identifier* identifier = name()->identifier())
+    const Name *theName = name();
+    if (!theName)
+        return;
+
+    if (const Identifier* identifier = theName->identifier())
         nameId = identifier->chars();
     else
         return;

src/libs/clangsupport/writemessageblock.cpp

@@ -57,7 +57,9 @@ void WriteMessageBlock::write(const MessageEnvelop &message)
 
     ++m_messageCounter;
 
-    m_ioDevice->write(block);
+    const qint64 bytesWritten = m_ioDevice->write(block);
+    if (bytesWritten == -1)
+        qWarning() << "Failed to write data:" << m_ioDevice->errorString();
 }
 
 qint64 WriteMessageBlock::counter() const

src/libs/utils/consoleprocess_unix.cpp

@@ -353,7 +353,7 @@ static const Terminal knownTerminals[] =
     {"urxvt", "-e"},
     {"xfce4-terminal", "-x"},
     {"konsole", "-e"},
-    {"gnome-terminal", "-x"}
+    {"gnome-terminal", "--"}
 };
 
 QString ConsoleProcess::defaultTerminalEmulator()

src/plugins/autotest/testrunner.cpp

@@ -309,7 +309,7 @@ static void processOutput(TestOutputReader *outputreader, const QString &msg,
                 break;
         }
         for (const QString &line : msg.mid(start).split('\n'))
-            outputreader->processOutput(line.toUtf8() + '\n');
+            outputreader->processOutput(line.toUtf8());
         break;
     }
     case Utils::OutputFormat::StdErrFormatSameLine:

src/plugins/cmakeprojectmanager/cmaketoolmanager.cpp

@@ -154,8 +154,14 @@ static QList<CMakeTool *> autoDetectCMakeTools()
     path.removeDuplicates();
 
     if (HostOsInfo::isWindowsHost()) {
-        path.append("C:/Program Files/CMake");
-        path.append("C:/Program Files (x86)/CMake");
+        const QString progFiles = QLatin1String(qgetenv("ProgramFiles"));
+        path.append(progFiles + "/CMake");
+        path.append(progFiles + "/CMake/bin");
+        const QString progFilesX86 = QLatin1String(qgetenv("ProgramFiles(x86)"));
+        if (!progFilesX86.isEmpty()) {
+            path.append(progFilesX86 + "/CMake");
+            path.append(progFilesX86 + "/CMake/bin");
+        }
     }
 
     if (HostOsInfo::isMacHost()) {

src/plugins/cmakeprojectmanager/servermodereader.cpp

@@ -249,7 +249,7 @@ CMakeConfig ServerModeReader::takeParsedConfiguration()
 }
 
 static void addCMakeVFolder(FolderNode *base, const Utils::FileName &basePath, int priority,
-                     const QString &displayName, QList<FileNode *> &files)
+                     const QString &displayName, const QList<FileNode *> &files)
 {
     if (files.isEmpty())
         return;
@@ -264,6 +264,17 @@ static void addCMakeVFolder(FolderNode *base, const Utils::FileName &basePath, i
         fn->compress();
 }
 
+static QList<FileNode *> removeKnownNodes(const QSet<Utils::FileName> &knownFiles, const QList<FileNode *> &files)
+{
+    return Utils::filtered(files, [&knownFiles](const FileNode *n) {
+        if (knownFiles.contains(n->filePath())) {
+            delete n;
+            return false;
+        }
+        return true;
+    });
+}
+
 static void addCMakeInputs(FolderNode *root,
                            const Utils::FileName &sourceDir,
                            const Utils::FileName &buildDir,
@@ -274,13 +285,19 @@ static void addCMakeInputs(FolderNode *root,
     ProjectNode *cmakeVFolder = new CMakeInputsNode(root->filePath());
     root->addNode(cmakeVFolder);
 
-    addCMakeVFolder(cmakeVFolder, sourceDir, 1000, QString(), sourceInputs);
+    QSet<Utils::FileName> knownFiles;
+    root->forEachGenericNode([&knownFiles](const Node *n) {
+        if (n->listInProject())
+            knownFiles.insert(n->filePath());
+    });
+
+    addCMakeVFolder(cmakeVFolder, sourceDir, 1000, QString(), removeKnownNodes(knownFiles, sourceInputs));
     addCMakeVFolder(cmakeVFolder, buildDir, 100,
                     QCoreApplication::translate("CMakeProjectManager::Internal::ServerModeReader", "<Build Directory>"),
-                    buildInputs);
+                    removeKnownNodes(knownFiles, buildInputs));
     addCMakeVFolder(cmakeVFolder, Utils::FileName(), 10,
                     QCoreApplication::translate("CMakeProjectManager::Internal::ServerModeReader", "<Other Locations>"),
-                    rootInputs);
+                    removeKnownNodes(knownFiles, rootInputs));
 }
 
 void ServerModeReader::generateProjectTree(CMakeProjectNode *root,
@@ -311,15 +328,15 @@ void ServerModeReader::generateProjectTree(CMakeProjectNode *root,
     if (topLevel)
         root->setDisplayName(topLevel->name);
 
-    if (!cmakeFilesSource.isEmpty() || !cmakeFilesBuild.isEmpty() || !cmakeFilesOther.isEmpty())
-        addCMakeInputs(root, m_parameters.sourceDirectory, m_parameters.buildDirectory,
-                       cmakeFilesSource, cmakeFilesBuild, cmakeFilesOther);
-
     QHash<Utils::FileName, ProjectNode *> cmakeListsNodes = addCMakeLists(root, cmakeLists);
     QList<FileNode *> knownHeaders;
     addProjects(cmakeListsNodes, m_projects, knownHeaders);
 
     addHeaderNodes(root, knownHeaders, allFiles);
+
+    if (!cmakeFilesSource.isEmpty() || !cmakeFilesBuild.isEmpty() || !cmakeFilesOther.isEmpty())
+        addCMakeInputs(root, m_parameters.sourceDirectory, m_parameters.buildDirectory,
+                       cmakeFilesSource, cmakeFilesBuild, cmakeFilesOther);
 }
 
 void ServerModeReader::updateCodeModel(CppTools::RawProjectParts &rpps)

src/plugins/debugger/gdb/gdbengine.cpp

@@ -4443,9 +4443,12 @@ void GdbEngine::setupInferior()
 
     //    if (!remoteArch.isEmpty())
     //        postCommand("set architecture " + remoteArch);
-        const QString solibSearchPath = rp.solibSearchPath.join(HostOsInfo::pathListSeparator());
-        if (!solibSearchPath.isEmpty())
-            runCommand({"set solib-search-path " + solibSearchPath});
+        if (!rp.solibSearchPath.isEmpty()) {
+            DebuggerCommand cmd("appendSolibSearchPath");
+            cmd.arg("path", rp.solibSearchPath);
+            cmd.arg("separator", HostOsInfo::pathListSeparator());
+            runCommand(cmd);
+        }
 
         if (!args.isEmpty())
             runCommand({"-exec-arguments " + args});

src/plugins/fakevim/fakevimhandler.cpp

@@ -4422,7 +4422,7 @@ bool FakeVimHandler::Private::handleNoSubMode(const Input &input)
     } else if (g.gflag && input.is('t')) {
         handleExCommand("tabnext");
     } else if (g.gflag && input.is('T')) {
-        handleExCommand("tabprev");
+        handleExCommand("tabprevious");
     } else if (input.isControl('t')) {
         handleExCommand("pop");
     } else if (!g.gflag && input.is('u') && !isVisualMode()) {
@@ -5565,7 +5565,7 @@ bool FakeVimHandler::Private::handleExSubstituteCommand(const ExCommand &cmd)
 
 bool FakeVimHandler::Private::handleExTabNextCommand(const ExCommand &cmd)
 {
-    if (cmd.cmd != "tabnext" && cmd.cmd != "tabn")
+    if (!cmd.matches("tabn", "tabnext"))
         return false;
 
     emit q->tabNextRequested(q);
@@ -5574,7 +5574,7 @@ bool FakeVimHandler::Private::handleExTabNextCommand(const ExCommand &cmd)
 
 bool FakeVimHandler::Private::handleExTabPreviousCommand(const ExCommand &cmd)
 {
-    if (cmd.cmd != "tabprevious" && cmd.cmd != "tabp")
+    if (!cmd.matches("tabp", "tabprevious"))
         return false;
 
     emit q->tabPreviousRequested(q);

src/plugins/git/gerrit/gerritpushdialog.cpp

@@ -26,7 +26,6 @@
 #include "gerritpushdialog.h"
 #include "ui_gerritpushdialog.h"
 #include "branchcombobox.h"
-#include "gerritserver.h"
 
 #include "../gitplugin.h"
 #include "../gitclient.h"
@@ -129,6 +128,7 @@ GerritPushDialog::GerritPushDialog(const QString &workingDir, const QString &rev
     m_ui->repositoryLabel->setText(QDir::toNativeSeparators(workingDir));
     m_ui->remoteComboBox->setRepository(workingDir);
     m_ui->remoteComboBox->setParameters(parameters);
+    m_ui->remoteComboBox->setAllowDups(true);
 
     PushItemDelegate *delegate = new PushItemDelegate(m_ui->commitView);
     delegate->setParent(this);

src/plugins/git/gerrit/gerritremotechooser.cpp

@@ -80,6 +80,11 @@ void GerritRemoteChooser::setFallbackEnabled(bool value)
     m_enableFallback = value;
 }
 
+void GerritRemoteChooser::setAllowDups(bool value)
+{
+    m_allowDups = value;
+}
+
 bool GerritRemoteChooser::setCurrentRemote(const QString &remoteName)
 {
     for (int i = 0, total = m_remoteComboBox->count(); i < total; ++i) {
@@ -118,9 +123,11 @@ bool GerritRemoteChooser::updateRemotes(bool forceReload)
 
 void GerritRemoteChooser::addRemote(const GerritServer &server, const QString &name)
 {
-    for (auto remote : m_remotes) {
-        if (remote.second == server)
-            return;
+    if (!m_allowDups) {
+        for (auto remote : m_remotes) {
+            if (remote.second == server)
+                return;
+        }
     }
     m_remoteComboBox->addItem(server.host + QString(" (%1)").arg(name));
     m_remotes.push_back({ name, server });

src/plugins/git/gerrit/gerritremotechooser.h

@@ -48,6 +48,7 @@ public:
     void setRepository(const QString  &repository);
     void setParameters(QSharedPointer<GerritParameters> parameters);
     void setFallbackEnabled(bool value);
+    void setAllowDups(bool value);
     bool setCurrentRemote(const QString &remoteName);
 
     bool updateRemotes(bool forceReload);
@@ -68,6 +69,7 @@ private:
     QToolButton *m_resetRemoteButton = nullptr;
     bool m_updatingRemotes = false;
     bool m_enableFallback = false;
+    bool m_allowDups = false;
     using NameAndServer = std::pair<QString, GerritServer>;
     std::vector<NameAndServer> m_remotes;
 };

src/plugins/help/helpplugin.cpp

@@ -629,6 +629,16 @@ void HelpPlugin::highlightSearchTermsInContextHelp()
 
 void HelpPlugin::handleHelpRequest(const QUrl &url, HelpManager::HelpViewerLocation location)
 {
+    static const QString qtcreatorUnversionedID = "org.qt-project.qtcreator";
+    if (url.host() == qtcreatorUnversionedID) {
+        // QtHelp doesn't know about versions, add the version number and use that
+        QUrl versioned = url;
+        versioned.setHost(qtcreatorUnversionedID + "."
+                          + QString::fromLatin1(Core::Constants::IDE_VERSION_LONG).remove('.'));
+        handleHelpRequest(versioned, location);
+        return;
+    }
+
     if (HelpViewer::launchWithExternalApp(url))
         return;
 
@@ -639,7 +649,7 @@ void HelpPlugin::handleHelpRequest(const QUrl &url, HelpManager::HelpViewerLocat
                 || address.startsWith("qthelp://com.trolltech.")) {
             // local help not installed, resort to external web help
             QString urlPrefix = "http://doc.qt.io/";
-            if (url.authority() == "org.qt-project.qtcreator")
+            if (url.authority().startsWith(qtcreatorUnversionedID))
                 urlPrefix.append(QString::fromLatin1("qtcreator"));
             else
                 urlPrefix.append("qt-5");

src/plugins/projectexplorer/projecttree.cpp

@@ -378,7 +378,9 @@ void ProjectTree::applyTreeManager(FolderNode *folder)
 bool ProjectTree::hasNode(const Node *node)
 {
     return Utils::contains(SessionManager::projects(), [node](const Project *p) {
-        return p && p->rootProjectNode() && p->rootProjectNode()->findNode([node](const Node *n) { return n == node; });
+        return p && p->rootProjectNode() && (
+                    p->containerNode() == node
+                    || p->rootProjectNode()->findNode([node](const Node *n) { return n == node; }));
     });
 }
 

src/plugins/qmldesigner/components/formeditor/movemanipulator.cpp

@@ -332,7 +332,7 @@ void MoveManipulator::clear()
     m_beginVerticalCenterHash.clear();
 }
 
-void MoveManipulator::reparentTo(FormEditorItem *newParent)
+void MoveManipulator::reparentTo(FormEditorItem *newParent, ReparentFlag flag)
 {
     deleteSnapLines();
 
@@ -348,7 +348,8 @@ void MoveManipulator::reparentTo(FormEditorItem *newParent)
             && newParent->qmlItemNode().modelNode().hasParentProperty()) {
         ModelNode grandParent = newParent->qmlItemNode().modelNode().parentProperty().parentModelNode();
         if (grandParent.metaInfo().isLayoutable()
-                && !NodeHints::fromModelNode(grandParent).isStackedContainer())
+                && !NodeHints::fromModelNode(grandParent).isStackedContainer()
+                && flag == DoNotEnforceReparent)
             newParent = m_view.data()->scene()->itemForQmlItemNode(QmlItemNode(grandParent));
     }
 

src/plugins/qmldesigner/components/formeditor/movemanipulator.h

@@ -48,6 +48,11 @@ public:
         UseBaseState
     };
 
+    enum ReparentFlag {
+        DoNotEnforceReparent,
+        EnforceReparent
+    };
+
     MoveManipulator(LayerItem *layerItem, FormEditorView *view);
     ~MoveManipulator();
     void setItems(const QList<FormEditorItem*> &itemList);
@@ -57,7 +62,7 @@ public:
 
     void begin(const QPointF& beginPoint);
     void update(const QPointF& updatePoint, Snapper::Snapping useSnapping, State stateToBeManipulated = UseCurrentState);
-    void reparentTo(FormEditorItem *newParent);
+    void reparentTo(FormEditorItem *newParent, ReparentFlag flag = DoNotEnforceReparent);
     void end();
     void end(Snapper::Snapping useSnapping);
 

src/plugins/qmldesigner/components/formeditor/movetool.cpp

@@ -113,7 +113,7 @@ void MoveTool::mouseMoveEvent(const QList<QGraphicsItem*> &itemList,
 
                 if (m_movingItems.count() > 1
                         || (movingItem->qmlItemNode().canBereparentedTo(containerItem->qmlItemNode())))
-                        m_moveManipulator.reparentTo(containerItem);
+                        m_moveManipulator.reparentTo(containerItem, MoveManipulator::EnforceReparent);
             }
         }
 

src/plugins/qmldesigner/components/formeditor/selectiontool.cpp

@@ -71,13 +71,6 @@ void SelectionTool::mousePressEvent(const QList<QGraphicsItem*> &itemList,
 
             m_itemAlreadySelected = toQmlItemNodeList(view()->selectedModelNodes()).contains(formEditorItem->qmlItemNode())
                     || !view()->hasSingleSelectedModelNode();
-
-            if (event->modifiers().testFlag(Qt::ControlModifier))
-                m_singleSelectionManipulator.select(SingleSelectionManipulator::InvertSelection);
-            else if (event->modifiers().testFlag(Qt::ShiftModifier))
-                m_singleSelectionManipulator.select(SingleSelectionManipulator::InvertSelection);
-            else
-                m_singleSelectionManipulator.select(SingleSelectionManipulator::ReplaceSelection);
         } else {
             if (event->modifiers().testFlag(Qt::AltModifier)) {
                 m_singleSelectionManipulator.begin(event->scenePos());
@@ -168,6 +161,12 @@ void SelectionTool::mouseReleaseEvent(const QList<QGraphicsItem*> &itemList,
 {
     if (event->button() == Qt::LeftButton) {
         if (m_singleSelectionManipulator.isActive()) {
+            if (event->modifiers().testFlag(Qt::ControlModifier))
+                m_singleSelectionManipulator.select(SingleSelectionManipulator::InvertSelection);
+            else if (event->modifiers().testFlag(Qt::ShiftModifier))
+                m_singleSelectionManipulator.select(SingleSelectionManipulator::InvertSelection);
+            else
+                m_singleSelectionManipulator.select(SingleSelectionManipulator::ReplaceSelection);
             m_singleSelectionManipulator.end(event->scenePos());
         } else if (m_rubberbandSelectionManipulator.isActive()) {
 

src/tools/clangbackend/ipcsource/clangjobqueue.cpp

@@ -53,6 +53,19 @@ bool JobQueue::add(const JobRequest &job)
         return false;
     }
 
+    if (!m_documents.hasDocument(job.filePath, job.projectPartId)) {
+        qCDebug(jobsLog) << "Not adding / cancelling due to already closed document:" << job;
+        cancelJobRequest(job);
+        return false;
+    }
+
+    const Document document = m_documents.document(job.filePath, job.projectPartId);
+    if (!document.isIntact()) {
+        qCDebug(jobsLog) << "Not adding / cancelling due not intact document:" << job;
+        cancelJobRequest(job);
+        return false;
+    }
+
     qCDebug(jobsLog) << "Adding" << job;
     m_queue.append(job);
 
@@ -90,7 +103,7 @@ void JobQueue::removeExpiredRequests()
     m_queue = cleanedRequests;
 }
 
-bool JobQueue::isJobRequestExpired(const JobRequest &jobRequest) const
+bool JobQueue::isJobRequestExpired(const JobRequest &jobRequest)
 {
     const JobRequest::ExpirationReasons expirationReasons = jobRequest.expirationReasons;
     const UnsavedFiles unsavedFiles = m_documents.unsavedFiles();
@@ -120,7 +133,8 @@ bool JobQueue::isJobRequestExpired(const JobRequest &jobRequest) const
         const Document document
                 = m_documents.document(jobRequest.filePath, jobRequest.projectPartId);
         if (!document.isIntact()) {
-            qCDebug(jobsLog) << "Removing due to not intact translation unit:" << jobRequest;
+            qCDebug(jobsLog) << "Removing/Cancelling due to not intact document:" << jobRequest;
+            cancelJobRequest(jobRequest);
             return true;
         }
 
@@ -174,6 +188,12 @@ void JobQueue::prioritizeRequests()
     std::stable_sort(m_queue.begin(), m_queue.end(), lessThan);
 }
 
+void JobQueue::cancelJobRequest(const JobRequest &jobRequest)
+{
+    if (m_cancelJobRequest)
+        m_cancelJobRequest(jobRequest);
+}
+
 static bool passesPreconditions(const JobRequest &request, const Document &document)
 {
     using Condition = JobRequest::Condition;
@@ -280,6 +300,11 @@ void JobQueue::setIsJobRunningForJobRequestHandler(
     m_isJobRunningForJobRequestHandler = isJobRunningHandler;
 }
 
+void JobQueue::setCancelJobRequest(const JobQueue::CancelJobRequest &cancelJobRequest)
+{
+    m_cancelJobRequest = cancelJobRequest;
+}
+
 JobRequests &JobQueue::queue()
 {
     return m_queue;

src/tools/clangbackend/ipcsource/clangjobqueue.h

@@ -51,17 +51,21 @@ public:
     void setIsJobRunningForJobRequestHandler(
             const IsJobRunningForJobRequestHandler &isJobRunningHandler);
 
+    using CancelJobRequest = std::function<void(const JobRequest &)>;
+    void setCancelJobRequest(const CancelJobRequest &cancelJobRequest);
+
 public: // for tests
     JobRequests &queue();
     int size() const;
     void prioritizeRequests();
 
 private:
+    void cancelJobRequest(const JobRequest &jobRequest);
     bool isJobRunningForTranslationUnit(const Utf8String &translationUnitId);
     bool isJobRunningForJobRequest(const JobRequest &jobRequest);
     JobRequests takeJobRequestsToRunNow();
     void removeExpiredRequests();
-    bool isJobRequestExpired(const JobRequest &jobRequest) const;
+    bool isJobRequestExpired(const JobRequest &jobRequest);
 
 private:
     Documents &m_documents;
@@ -69,6 +73,7 @@ private:
 
     IsJobRunningForTranslationUnitHandler m_isJobRunningForTranslationUnitHandler;
     IsJobRunningForJobRequestHandler m_isJobRunningForJobRequestHandler;
+    CancelJobRequest m_cancelJobRequest;
 
     JobRequests m_queue;
 };

src/tools/clangbackend/ipcsource/clangjobs.cpp

@@ -29,6 +29,9 @@
 #include "clangiasyncjob.h"
 #include "projects.h"
 
+#include <clangsupport/cmbcodecompletedmessage.h>
+#include <clangsupport/referencesmessage.h>
+
 #include <QDebug>
 #include <QFutureSynchronizer>
 #include <QLoggingCategory>
@@ -54,6 +57,9 @@ Jobs::Jobs(Documents &documents,
     m_queue.setIsJobRunningForJobRequestHandler([this](const JobRequest &jobRequest) {
         return isJobRunningForJobRequest(jobRequest);
     });
+    m_queue.setCancelJobRequest([this](const JobRequest &jobRequest) {
+        return cancelJobRequest(jobRequest);
+    });
 }
 
 Jobs::~Jobs()
@@ -197,4 +203,29 @@ bool Jobs::isJobRunningForJobRequest(const JobRequest &jobRequest) const
     return Utils::anyOf(m_running.values(), hasJobRequest);
 }
 
+void Jobs::cancelJobRequest(const JobRequest &jobRequest)
+{
+    // TODO: Consider to refactor this. Jobs should not know anything about
+    // concrete messages. On the other hand, having this here avoids
+    // duplication in multiple job classes.
+
+    // If a job request with a ticket number is cancelled, the plugin side
+    // must get back some results in order to clean up the state there.
+    switch (jobRequest.type) {
+    case JobRequest::Type::RequestReferences:
+        m_client.references(ReferencesMessage(FileContainer(),
+                                              QVector<SourceRangeContainer>(),
+                                              false,
+                                              jobRequest.ticketNumber));
+        break;
+    case JobRequest::Type::CompleteCode:
+        m_client.codeCompleted(CodeCompletedMessage(CodeCompletions(),
+                                                    CompletionCorrection::NoCorrection,
+                                                    jobRequest.ticketNumber));
+        break;
+    default:
+        break;
+    }
+}
+
 } // namespace ClangBackEnd

src/tools/clangbackend/ipcsource/clangjobs.h

@@ -80,6 +80,7 @@ public /*for tests*/:
     bool isJobRunningForJobRequest(const JobRequest &jobRequest) const;
 
 private:
+    void cancelJobRequest(const JobRequest &jobRequest);
     JobRequests runJobs(const JobRequests &jobRequest);
     bool runJob(const JobRequest &jobRequest);
     void onJobFinished(IAsyncJob *asyncJob);

tests/auto/debugger/tst_dumpers.cpp

@@ -1314,7 +1314,13 @@ void tst_Dumpers::dumper()
                 "\n#define BREAK qtcDebugBreakFunction();"
                 "\n\nvoid unused(const void *first,...) { (void) first; }"
             "\n#else"
-                "\n#include <stdint.h>\n";
+                "\n#include <stdint.h>"
+                "\n#ifndef _WIN32"
+                    "\ntypedef char CHAR;"
+                    "\ntypedef char *PCHAR;"
+                    "\ntypedef wchar_t WCHAR;"
+                    "\ntypedef wchar_t *PWCHAR;"
+                "\n#endif\n";
 
     if (m_debuggerEngine == LldbEngine)
 //#ifdef Q_OS_MAC
@@ -5211,7 +5217,9 @@ void tst_Dumpers::dumper_data()
                     "char s[] = \"aöa\";\n"
                     "char t[] = \"aöax\";\n"
                     "wchar_t w[] = L\"aöa\";\n"
-                    "unused(&s, &t, &w);\n")
+                    "CHAR ch[] = \"aöa\";\n"
+                    "WCHAR wch[] = L\"aöa\";\n"
+                    "unused(&s, &t, &w, &ch, &wch);\n")
 
                + CheckType("s", "char [5]") % NoCdbEngine
                + CheckType("s", "char [4]") % CdbEngine
@@ -5219,7 +5227,12 @@ void tst_Dumpers::dumper_data()
                + CheckType("t", "char [6]") % NoCdbEngine
                + CheckType("t", "char [5]") % CdbEngine
                + Check("t.0", "[0]", "97", "char")
-               + CheckType("w", "wchar_t [4]");
+               + CheckType("w", "wchar_t [4]")
+               + Check("ch.0", "[0]", "97", "CHAR")
+               + CheckType("ch", "CHAR [5]") % NoCdbEngine
+               + CheckType("ch", "CHAR [4]") % CdbEngine
+               + Check("wch.0", "[0]", "97", "WCHAR")
+               + CheckType("wch", "WCHAR [4]");
 
 
     QTest::newRow("CharPointers")