1. 02 Nov, 2010 17 commits
    • mae's avatar
      Fix painting order · 8415d0fa
      mae authored
      text on top of seach results on top of find scope on
      top of ifdefed out lines.
      8415d0fa
    • hjk's avatar
      qtpromaker: refactoring · b4df5861
      hjk authored
      b4df5861
    • con's avatar
      Fixes restoration of main window geometry. · a757c558
      con authored
      We were handling it ourselves, now we let saveGeometry and saveState do
      its job. This also takes care of making the geometry valid for offscreen
      saved states.
      
      Task-number: QTCREATORBUG-1689
      a757c558
    • Robert Loehning's avatar
      Compile fix · 78fc8e30
      Robert Loehning authored
      Reviewed-by: hjk
      78fc8e30
    • Arvid Ephraim Picciani's avatar
      fakevim: Fix cursor movement in insert mode on Mac. · 51c84911
      Arvid Ephraim Picciani authored
      Reviewed-by: hjk
      51c84911
    • con's avatar
      b287b06e
    • con's avatar
      Merge remote branch 'origin/2.1' · 61f7965b
      con 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/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
      61f7965b
    • Friedemann Kleint's avatar
      5a5d4641
    • Thomas Hartmann's avatar
      QmlDesigner: fixes crash · a4640e36
      Thomas Hartmann authored
      Deleting an items might have a side effect that turns
      the qml code invalid. (e. g. alias properties)
      
      We catch this an show a proper error message.
      
      Task-number: QTCREATORBUG-2973
      Reviewed-by: Kai Koehne
      a4640e36
    • con's avatar
      Version bump. · d7216e84
      con authored
      d7216e84
    • con's avatar
      Merge remote branch 'origin/2.1' · dbb1c5ef
      con authored
      dbb1c5ef
    • con's avatar
      Add auto test for file search. · a031112b
      con authored
      a031112b
    • Friedemann Kleint's avatar
      Exported Header cleanup: QmlJSEditor · 77008bc4
      Friedemann Kleint authored
      
      
      Move internal classes QmlJSEditorEditable/SemanticHighlighter
      out of qmljseditor.h. Move QmlJSEditor from namespace
      QmlJSEditor::Internal to QmlJSEditor.
      Reviewed-by: default avatarChristian Kamm <christian.d.kamm@nokia.com>
      77008bc4
    • con's avatar
      Merge remote branch 'origin/2.1.0' into 2.1 · 5abfdbc1
      con authored
      5abfdbc1
    • hjk's avatar
      debugger: work around gdb 7.2 quirk in QFlag dumper · afef6dd0
      hjk authored
      Reviewed-By: Friedemann Kleint
      afef6dd0
    • hjk's avatar
      debugger: make QFile and QFileInfo visible without top-level inferior call · 7b6022be
      hjk authored
      Reviewed-by: Oswald Buddenhagen
      7b6022be
    • hjk's avatar
      debugger: fix dumping of reference targets · 8df0f12e
      hjk authored
      Reviewed-by: Alessandro Portale
      8df0f12e
  2. 01 Nov, 2010 23 commits