Skip to content
Snippets Groups Projects
  1. Jun 24, 2013
  2. Jun 17, 2013
  3. May 15, 2013
  4. May 08, 2013
  5. May 07, 2013
  6. May 03, 2013
  7. May 02, 2013
  8. Apr 30, 2013
  9. Apr 29, 2013
    • 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
  10. Apr 26, 2013
  11. Apr 19, 2013
  12. Apr 10, 2013
  13. Apr 03, 2013
  14. Mar 12, 2013
  15. Jan 29, 2013
  16. Jan 08, 2013
    • 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
  17. Nov 22, 2012
  18. Oct 23, 2012
  19. Oct 05, 2012
  20. Jul 19, 2012
  21. Feb 20, 2012
  22. Feb 15, 2012
  23. Feb 08, 2012
  24. Jan 26, 2012
  25. Nov 03, 2011
  26. May 06, 2011
  27. Apr 13, 2011
  28. Feb 22, 2011
    • 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
  29. Jan 12, 2011
  30. Dec 17, 2010
  31. Jul 02, 2010
  32. Jun 14, 2010
  33. Jun 04, 2010
  34. May 25, 2010
  35. Mar 24, 2010
Loading