1. 11 Oct, 2010 12 commits
    • con's avatar
      Use the encoding settings when doing multi-file searches. · d2a91ed1
      con authored
      Task-number: QTCREATORBUG-65
      d2a91ed1
    • con's avatar
      Share some code between all projects and current projects find. · 38d3090a
      con authored
      Also some const correctness.
      38d3090a
    • con's avatar
      Add method for default text encoding to editor manager. · 4e7c07d9
      con authored
      Moving the logic out of BaseTextDocument for use at other places.
      4e7c07d9
    • Christian Kamm's avatar
      Merge remote branch 'origin/2.1' · b78c1ef6
      Christian Kamm authored
      Conflicts:
      	README
      	doc/qt-html-templates.qdocconf
      	doc/qtcreator.qdoc
      	doc/qtcreator.qdocconf
      	share/qtcreator/templates/wizards/qtcreatorplugin/MyPlugin.pluginspec
      	src/app/Info.plist
      	src/plugins/bineditor/BinEditor.pluginspec
      	src/plugins/bookmarks/Bookmarks.pluginspec
      	src/plugins/classview/ClassView.pluginspec
      	src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec
      	src/plugins/coreplugin/Core.pluginspec
      	src/plugins/coreplugin/coreconstants.h
      	src/plugins/cpaster/CodePaster.pluginspec
      	src/plugins/cppeditor/CppEditor.pluginspec
      	src/plugins/cpptools/CppTools.pluginspec
      	src/plugins/cvs/CVS.pluginspec
      	src/plugins/debugger/Debugger.pluginspec
      	src/plugins/debugger/breakhandler.cpp
      	src/plugins/designer/Designer.pluginspec
      	src/plugins/fakevim/FakeVim.pluginspec
      	src/plugins/find/Find.pluginspec
      	src/plugins/genericprojectmanager/GenericProjectManager.pluginspec
      	src/plugins/git/ScmGit.pluginspec
      	src/plugins/helloworld/HelloWorld.pluginspec
      	src/plugins/help/Help.pluginspec
      	src/plugins/imageviewer/ImageViewer.pluginspec
      	src/plugins/locator/Locator.pluginspec
      	src/plugins/mercurial/Mercurial.pluginspec
      	src/plugins/perforce/Perforce.pluginspec
      	src/plugins/projectexplorer/ProjectExplorer.pluginspec
      	src/plugins/qmldesigner/QmlDesigner.pluginspec
      	src/plugins/qmljseditor/QmlJSEditor.pluginspec
      	src/plugins/qmljsinspector/QmlJSInspector.pluginspec
      	src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
      	src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
      	src/plugins/regexp/RegExp.pluginspec
      	src/plugins/resourceeditor/ResourceEditor.pluginspec
      	src/plugins/snippets/Snippets.pluginspec
      	src/plugins/subversion/Subversion.pluginspec
      	src/plugins/tasklist/TaskList.pluginspec
      	src/plugins/texteditor/TextEditor.pluginspec
      	src/plugins/vcsbase/VCSBase.pluginspec
      	src/plugins/welcome/Welcome.pluginspec
      	tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp
      	tests/manual/fakevim/fakevim.pro
      	tests/manual/ssh/errorhandling/main.cpp
      b78c1ef6
    • kh1's avatar
      Fix missing member initialization. · 4661e874
      kh1 authored
      Task-number: QTCREATORBUG-2694
      Reviewed-by: ck
      4661e874
    • Friedemann Kleint's avatar
      Debugger[CDB]: Do not evaluate watch expressions at all. · 82f80d54
      Friedemann Kleint authored
      setError() on them instead (should there be any from
      a session mixup). Give the session engine watcher
      capabilities and ensure 'Remove watch item' is enabled
      for the session engine by checking the debugger state.
      
      Reviewed-by: hjk
      82f80d54
    • hjk's avatar
      debugger: fix auto tests · 6d0f0c7c
      hjk authored
      Reviewed-by: Friedemann Kleint
      6d0f0c7c
    • hjk's avatar
      fakevim: fix :wq complaint when writing to the current file. · 48a75201
      hjk authored
      Reviewed-by: Kornelia Poenitz
      48a75201
    • hjk's avatar
      debugger: Fix state of breakpoint marker when disabling it using the breakpoint view · 3cb91a14
      hjk authored
      There was not updated cached state within the marker object.
      
      Reviewed-by: Friedemann Kleint
      
      Task: QTCREATORBUG-2544
      3cb91a14
    • hjk's avatar
      fakevim: fix 'Delete' in insert mode to delete exactly one char again · da91600b
      hjk authored
      Reviewed-by: Kornelia Poenitz
      da91600b
    • kh1's avatar
      Fix broken env reader, it did not reread on device changes. · ea56809c
      kh1 authored
      Reviewed-by: ck
      ea56809c
    • kh1's avatar
      Speedup project loading, we now parse only the targets runtime info. · a81e3325
      kh1 authored
      Reviewed-by: ck
      a81e3325
  2. 08 Oct, 2010 28 commits