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