Skip to content
Snippets Groups Projects
  1. Jul 09, 2010
  2. Mar 05, 2010
  3. Jan 07, 2010
  4. Jan 05, 2010
  5. Dec 14, 2009
  6. Dec 11, 2009
  7. Aug 14, 2009
  8. Jun 19, 2009
  9. Jun 16, 2009
    • 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
  10. May 28, 2009
    • Friedemann Kleint's avatar
      Fixed p4 plugin. · 8c45eb57
      Friedemann Kleint authored
      Introduce settings struct again. Add an errorString() to
      the settings class. Change checkP4Command to checkP4Configuration
      and make it report errors when appropriate. Make errorString show
      up in settings page and add "Test" button.
      Build options correctly (omit empty settings) and use basic
      options for the test (which was the bug causing p4 to be
      disabled if options were actually specified).
      8c45eb57
  11. Feb 25, 2009
  12. Feb 19, 2009
    • dt's avatar
      Fixes: Make QtCreator fly even in face of perforce misconfiguration. · 469639fb
      dt authored
      Details:  If p4 is in path, but the server isn't configured correctly we
      were pretty slow, this fixes that by running p4 client -o after the
      settings have changed, if that doesn't return after 2 seconds, then we
      cache that as a invalid configuration.
      469639fb
  13. Jan 13, 2009
  14. Dec 16, 2008
  15. Dec 02, 2008
Loading