diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2013-04-28 11:20:02 +0300 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@digia.com> | 2013-04-29 08:38:02 +0200 |
| commit | a8ff5e8343286608e86e0d06a6681b7cd0b48d5e (patch) | |
| tree | 63cabd9e157c3eff19b6044f418713845d3bb0f3 /src/plugins/cpptools/cpptoolseditorsupport.h | |
| parent | 81f62d36734e794f0a39b49308e51ebefcd0e2c6 (diff) | |
| download | qt-creator-a8ff5e8343286608e86e0d06a6681b7cd0b48d5e.tar.gz | |
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: Nikolai Kosjar <nikolai.kosjar@digia.com>
Diffstat (limited to 'src/plugins/cpptools/cpptoolseditorsupport.h')
| -rw-r--r-- | src/plugins/cpptools/cpptoolseditorsupport.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/cpptools/cpptoolseditorsupport.h b/src/plugins/cpptools/cpptoolseditorsupport.h index c36951c1b3..d7534f33e2 100644 --- a/src/plugins/cpptools/cpptoolseditorsupport.h +++ b/src/plugins/cpptools/cpptoolseditorsupport.h @@ -111,7 +111,7 @@ signals: void documentUpdated(); void diagnosticsChanged(); void semanticInfoUpdated(CppTools::SemanticInfo); - void highlighterStarted(QFuture<TextEditor::HighlightingResult>, unsigned revision); + void highlighterStarted(QFuture<TextEditor::HighlightingResult> *, unsigned revision); private slots: void updateDocument(); |