1. 24 May, 2013 2 commits
  2. 16 May, 2013 1 commit
  3. 15 May, 2013 1 commit
  4. 07 May, 2013 2 commits
  5. 06 May, 2013 1 commit
  6. 02 May, 2013 1 commit
  7. 30 Apr, 2013 1 commit
  8. 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
  9. 26 Apr, 2013 1 commit
  10. 19 Apr, 2013 2 commits
  11. 18 Apr, 2013 1 commit
  12. 17 Apr, 2013 1 commit
  13. 10 Apr, 2013 2 commits
  14. 09 Apr, 2013 1 commit
  15. 08 Apr, 2013 1 commit
  16. 03 Apr, 2013 1 commit
  17. 08 Mar, 2013 2 commits
  18. 26 Feb, 2013 1 commit
  19. 21 Feb, 2013 2 commits
    • Erik Verbruggen's avatar
      Fix compilation issue with clang. · edec1c1d
      Erik Verbruggen authored
      
      
      cppeditor.cpp:2631:13: error: use of overloaded operator '+' is ambiguous (with operand types 'QChar' and 'QChar')
                  + characterAt(pos - 2)
                  ^ ~~~~~~~~~~~~~~~~~~~~
      ../../../../../builds/qt5-stable/qtbase/include/QtCore/../../src/corelib/tools/qstring.h:1116:22: note: candidate function
      inline const QString operator+(const QString &s1, QChar s2)
                           ^
      ../../../../../builds/qt5-stable/qtbase/include/QtCore/../../src/corelib/tools/qstring.h:1118:22: note: candidate function
      inline const QString operator+(QChar s1, const QString &s2)
                           ^
      ../../../../../builds/qt5-stable/qtbase/include/QtCore/../../src/corelib/tools/qstring.h:1114:22: note: candidate function
      inline const QString operator+(const QString &s1, const QString &s2)
                           ^
      
      Change-Id: I65663a901d301d6b0a3df2c8b5631e9aa5ab081b
      Reviewed-by: default avatarDavid Schulz <david.schulz@digia.com>
      edec1c1d
    • Knut Petter Svendsen's avatar
      C++: Improved automatic Doxygen comment blocks with CppStyle · c937226d
      Knut Petter Svendsen authored
      
      
      Added support for CppStyle for Doxygen block generation when
      hitting enter after a /// or //! comment. Previously only
      QtStyle and JavaStyle was supported.
      
      Change-Id: Ib010e55ba602127a6842ba02034fbe85994ee2bd
      Reviewed-by: default avatarDavid Schulz <david.schulz@digia.com>
      c937226d
  20. 19 Feb, 2013 2 commits
  21. 14 Feb, 2013 2 commits
  22. 11 Feb, 2013 1 commit
  23. 01 Feb, 2013 1 commit
  24. 29 Jan, 2013 1 commit
  25. 23 Jan, 2013 1 commit
  26. 22 Jan, 2013 1 commit
  27. 11 Jan, 2013 1 commit
    • Petar Perisin's avatar
      Editor: Allow to open links in a new split. · 39e9c5ef
      Petar Perisin authored
      
      
      This changes current behavior while opening links. Link is now opened in
      next split by default. If you use CTRL+Click to open links, it will also
      open in next split. However, by using CTRL+ALT+click it will open in
      current split.
      
      There are two new checkboxes in Tools/Options/Text Editor/Display:
      - "Open Links in New Split" - if it is checked, links will not be opened
      in current split. However, if document with link is already opened, it
      will be used to open the split
      - "Force open links in next split" - Links will always open in next
      split, even if their document is already opened somewhere else.
      
      Task-number: QTCREATORBUG-8117
      Change-Id: Ib99075b55d9e9683ed2c2386767227457de0a3fc
      Reviewed-by: default avatarDavid Schulz <david.schulz@digia.com>
      39e9c5ef
  28. 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
  29. 12 Dec, 2012 1 commit
  30. 06 Dec, 2012 1 commit
  31. 04 Dec, 2012 1 commit
  32. 20 Nov, 2012 1 commit