1. 19 Aug, 2013 1 commit
  2. 24 Jun, 2013 1 commit
  3. 15 May, 2013 1 commit
  4. 07 May, 2013 1 commit
  5. 02 May, 2013 1 commit
  6. 30 Apr, 2013 1 commit
  7. 29 Apr, 2013 1 commit
    • Orgad Shaneh's avatar
      Fix link error with MSVC · a8ff5e83
      Orgad Shaneh authored
      
      
      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>
      a8ff5e83
  8. 26 Apr, 2013 1 commit
  9. 10 Apr, 2013 1 commit
  10. 08 Apr, 2013 1 commit
  11. 03 Apr, 2013 1 commit
  12. 21 Feb, 2013 1 commit
  13. 29 Jan, 2013 1 commit
  14. 05 Oct, 2012 1 commit
  15. 19 Jul, 2012 1 commit
  16. 20 Feb, 2012 1 commit
  17. 15 Feb, 2012 1 commit
  18. 08 Feb, 2012 1 commit
  19. 26 Jan, 2012 1 commit
  20. 03 Nov, 2011 1 commit
  21. 06 May, 2011 1 commit
  22. 13 Apr, 2011 1 commit
  23. 04 Feb, 2011 1 commit
  24. 12 Jan, 2011 2 commits
  25. 17 Dec, 2010 1 commit
  26. 16 Sep, 2010 1 commit
    • Friedemann Kleint's avatar
      Further header cleanup. · bb13b69e
      Friedemann Kleint authored
      Introduce some more private classes for the coreplugin,
      use header include convention
      <QtModule/QClass>, de-qobjectify VariableManager.
      bb13b69e
  27. 02 Jul, 2010 1 commit
  28. 14 Jun, 2010 1 commit
  29. 04 Jun, 2010 2 commits
  30. 24 Mar, 2010 1 commit
  31. 05 Mar, 2010 1 commit
  32. 15 Dec, 2009 1 commit
  33. 13 Nov, 2009 1 commit
  34. 21 Oct, 2009 1 commit
  35. 14 Aug, 2009 1 commit
  36. 16 Jun, 2009 2 commits
    • con's avatar
      Cherry-pick: Update license headers and sales contact details. · 2919c210
      con authored
      Reviewed-by: Trust Me
      
      Conflicts:
      
      	src/libs/cplusplus/CppBindings.cpp
      	src/libs/cplusplus/CppBindings.h
      	src/libs/cplusplus/FastPreprocessor.cpp
      	src/libs/cplusplus/FastPreprocessor.h
      	src/plugins/cpptools/cppcurrentdocumentfilter.cpp
      	src/plugins/cpptools/cppcurrentdocumentfilter.h
      	src/plugins/cpptools/cppsemanticsearch.cpp
      	src/plugins/cpptools/cppsemanticsearch.h
      	src/plugins/duieditor/parser/qmljs.g
      	src/plugins/duieditor/parser/qmljsast.cpp
      	src/plugins/duieditor/parser/qmljsast_p.h
      	src/plugins/duieditor/parser/qmljsastfwd_p.h
      	src/plugins/duieditor/parser/qmljsastvisitor.cpp
      	src/plugins/duieditor/parser/qmljsastvisitor_p.h
      	src/plugins/duieditor/parser/qmljsengine_p.cpp
      	src/plugins/duieditor/parser/qmljsengine_p.h
      	src/plugins/duieditor/parser/qmljsgrammar.cpp
      	src/plugins/duieditor/parser/qmljsgrammar_p.h
      	src/plugins/duieditor/parser/qmljslexer.cpp
      	src/plugins/duieditor/parser/qmljslexer_p.h
      	src/plugins/duieditor/parser/qmljsmemorypool_p.h
      	src/plugins/duieditor/parser/qmljsnodepool_p.h
      	src/plugins/duieditor/parser/qmljsparser.cpp
      	src/plugins/duieditor/parser/qmljsparser_p.h
      	src/plugins/duieditor/parser/qmljsprettypretty.cpp
      	src/plugins/duieditor/parser/qmljsprettypretty_p.h
      	src/plugins/duieditor/rewriter/rewriter.cpp
      	src/plugins/duieditor/rewriter/rewriter_p.h
      	src/plugins/duieditor/rewriter/textwriter.cpp
      	src/plugins/duieditor/rewriter/textwriter_p.h
      	src/shared/cplusplus/ASTClone.cpp
      	tests/manual/cplusplus/main.cpp
      2919c210
    • Jason McDonald's avatar
      Update license headers and sales contact details. · 884b7af7
      Jason McDonald authored
      Reviewed-by: Trust Me
      884b7af7
  37. 15 Jun, 2009 1 commit