Commit a8ff5e83 authored by Orgad Shaneh's avatar Orgad Shaneh Committed by Nikolai Kosjar

Fix link error with MSVC

CppTools.lib(CppTools.dll) : error LNK2005: "public: virtual __thiscall
  QFutureInterface<class TextEditor::HighlightingResult>::~QFutureInterface<class TextEditor::HighlightingResult>(void)"
  (??1?$QFutureInterface@VHighlightingResult@TextEditor@@@@UAE@XZ) already defined in moc_cppeditor.obj
   Creating library ..\..\..\lib\qtcreator\plugins\QtProject\CppEditor.lib and object
   ..\..\..\lib\qtcreator\plugins\QtProject\CppEditor.exp..\..\..\lib\qtcreator\plugins\QtProject\CppEditor.dll :
   fatal error LNK1169: one or more multiply defined symbols found

Change-Id: Id53a0f8a99dbd18a9cbdf2af57b4f3970f5c41a3
Reviewed-by: default avatarNikolai Kosjar <nikolai.kosjar@digia.com>
parent 81f62d36
...@@ -534,8 +534,8 @@ CPPEditorWidget::CPPEditorWidget(QWidget *parent) ...@@ -534,8 +534,8 @@ CPPEditorWidget::CPPEditorWidget(QWidget *parent)
this, SLOT(onDocumentUpdated())); this, SLOT(onDocumentUpdated()));
connect(editorSupport, SIGNAL(semanticInfoUpdated(CppTools::SemanticInfo)), connect(editorSupport, SIGNAL(semanticInfoUpdated(CppTools::SemanticInfo)),
this, SLOT(updateSemanticInfo(CppTools::SemanticInfo))); this, SLOT(updateSemanticInfo(CppTools::SemanticInfo)));
connect(editorSupport, SIGNAL(highlighterStarted(QFuture<TextEditor::HighlightingResult>, unsigned)), connect(editorSupport, SIGNAL(highlighterStarted(QFuture<TextEditor::HighlightingResult> *, unsigned)),
this, SLOT(highlighterStarted(QFuture<TextEditor::HighlightingResult>, unsigned))); this, SLOT(highlighterStarted(QFuture<TextEditor::HighlightingResult> *, unsigned)));
m_completionSupport = m_modelManager->completionSupport(editor()); m_completionSupport = m_modelManager->completionSupport(editor());
} }
...@@ -1978,10 +1978,10 @@ void CPPEditorWidget::semanticRehighlight(bool force) ...@@ -1978,10 +1978,10 @@ void CPPEditorWidget::semanticRehighlight(bool force)
m_modelManager->cppEditorSupport(editor())->recalculateSemanticInfoDetached(force); m_modelManager->cppEditorSupport(editor())->recalculateSemanticInfoDetached(force);
} }
void CPPEditorWidget::highlighterStarted(QFuture<TextEditor::HighlightingResult> highlighter, void CPPEditorWidget::highlighterStarted(QFuture<TextEditor::HighlightingResult> *highlighter,
unsigned revision) unsigned revision)
{ {
m_highlighter = highlighter; m_highlighter = *highlighter;
m_highlightRevision = revision; m_highlightRevision = revision;
m_highlightWatcher.setFuture(m_highlighter); m_highlightWatcher.setFuture(m_highlighter);
} }
......
...@@ -141,7 +141,7 @@ public Q_SLOTS: ...@@ -141,7 +141,7 @@ public Q_SLOTS:
void findUsages(); void findUsages();
void renameUsagesNow(const QString &replacement = QString()); void renameUsagesNow(const QString &replacement = QString());
void semanticRehighlight(bool force = false); void semanticRehighlight(bool force = false);
void highlighterStarted(QFuture<TextEditor::HighlightingResult> highlighter, unsigned revision); void highlighterStarted(QFuture<TextEditor::HighlightingResult> *highlighter, unsigned revision);
protected: protected:
bool event(QEvent *e); bool event(QEvent *e);
......
...@@ -290,13 +290,13 @@ void CppEditorSupport::startHighlighting() ...@@ -290,13 +290,13 @@ void CppEditorSupport::startHighlighting()
m_highlighter = m_highlightingSupport->highlightingFuture(doc, snapshot); m_highlighter = m_highlightingSupport->highlightingFuture(doc, snapshot);
m_lastHighlightRevision = revision; m_lastHighlightRevision = revision;
emit highlighterStarted(m_highlighter, m_lastHighlightRevision); emit highlighterStarted(&m_highlighter, m_lastHighlightRevision);
} else { } else {
static const Document::Ptr dummyDoc; static const Document::Ptr dummyDoc;
static const Snapshot dummySnapshot; static const Snapshot dummySnapshot;
m_highlighter = m_highlightingSupport->highlightingFuture(dummyDoc, dummySnapshot); m_highlighter = m_highlightingSupport->highlightingFuture(dummyDoc, dummySnapshot);
m_lastHighlightRevision = editorRevision(); m_lastHighlightRevision = editorRevision();
emit highlighterStarted(m_highlighter, m_lastHighlightRevision); emit highlighterStarted(&m_highlighter, m_lastHighlightRevision);
} }
} }
......
...@@ -111,7 +111,7 @@ signals: ...@@ -111,7 +111,7 @@ signals:
void documentUpdated(); void documentUpdated();
void diagnosticsChanged(); void diagnosticsChanged();
void semanticInfoUpdated(CppTools::SemanticInfo); void semanticInfoUpdated(CppTools::SemanticInfo);
void highlighterStarted(QFuture<TextEditor::HighlightingResult>, unsigned revision); void highlighterStarted(QFuture<TextEditor::HighlightingResult> *, unsigned revision);
private slots: private slots:
void updateDocument(); void updateDocument();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment