1. 09 Sep, 2013 2 commits
  2. 30 Aug, 2013 1 commit
  3. 19 Aug, 2013 1 commit
  4. 25 Jul, 2013 1 commit
  5. 17 Jul, 2013 1 commit
  6. 09 Jul, 2013 1 commit
  7. 24 Jun, 2013 1 commit
  8. 17 Jun, 2013 1 commit
  9. 15 May, 2013 1 commit
  10. 08 May, 2013 1 commit
  11. 07 May, 2013 3 commits
  12. 03 May, 2013 1 commit
  13. 02 May, 2013 1 commit
  14. 30 Apr, 2013 1 commit
  15. 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
  16. 26 Apr, 2013 1 commit
  17. 19 Apr, 2013 1 commit
  18. 10 Apr, 2013 1 commit
  19. 03 Apr, 2013 1 commit
  20. 12 Mar, 2013 1 commit
  21. 29 Jan, 2013 1 commit
  22. 08 Jan, 2013 1 commit
    • Orgad Shaneh's avatar
      Remove braces for single lines of conditions · 29a93998
      Orgad Shaneh authored
      #!/usr/bin/env ruby
      
      Dir.glob('**/*.cpp') { |file|
        # skip ast (excluding paste, astpath, and canv'ast'imer)
        next if file =~ /ast[^eip]|keywords\.|qualifiers|preprocessor|names.cpp/i
        s = File.read(file)
        next if s.include?('qlalr')
        orig = s.dup
        s.gsub!(/\n *if [^\n]*{\n[^\n]*\n\s+}(\s+else if [^\n]* {\n[^\n]*\n\s+})*(\s+else {\n[^\n]*\n\s+})?\n/m) { |m|
          res = $&
          if res =~ /^\s*(\/\/|[A-Z_]{3,})/ # C++ comment or macro (Q_UNUSED, SDEBUG), do not touch braces
            res
          else
            res.gsub!('} else', 'else')
            res.gsub!(/\n +} *\n/m, "\n")
            res.gsub(/ *{$/, '')
          end
        }
        s.gsub!(/ *$/, '')
        File.open(file, 'wb').write(s) if s != orig
      }
      
      Change-Id: I3b30ee60df0986f66c02132c65fc38a3fbb6bbdc
      Reviewed-by: default avatarhjk <qthjk@ovi.com>
      29a93998
  23. 22 Nov, 2012 1 commit
  24. 23 Oct, 2012 1 commit
  25. 05 Oct, 2012 1 commit
  26. 19 Jul, 2012 1 commit
  27. 20 Feb, 2012 2 commits
  28. 15 Feb, 2012 1 commit
  29. 08 Feb, 2012 1 commit
  30. 26 Jan, 2012 1 commit
  31. 03 Nov, 2011 1 commit
  32. 06 May, 2011 1 commit
  33. 13 Apr, 2011 1 commit
  34. 22 Feb, 2011 1 commit
    • hjk's avatar
      texteditor: merge ITextEditable into ITextEditor · f576ad9f
      hjk authored
      rename BastTextEditor->BaseTextEditorWidget, BaseTextEditorEditable->BaseTextEditor
      rename BaseTextEditor{,Widget} subclasses
      rename editableInterface->editorInterface
      rename createEditableInterface->createEditor
      minor cleanups after renamings
      f576ad9f
  35. 12 Jan, 2011 2 commits