Skip to content
Snippets Groups Projects
  1. Jun 08, 2010
    • Christian Kamm's avatar
      QmlJS: Don't append colons when completing namespaced types. · 019ff9d0
      Christian Kamm authored
      Task-number: QTCREATORBUG-1604
      019ff9d0
    • Jarek Kobus's avatar
      When adding a form file to a project add also its qrc files · 9d77b7c1
      Jarek Kobus authored
      
      Extract qrc paths from ui file by simple xml parsing.
      
      Reviewed-by: default avatardt <qtc-committer@nokia.com>
      Reviewed-by: default avatarFriedemann Kleint <qtc-committer@nokia.com>
      Task-number: QTCREATORBUG-42
      9d77b7c1
    • Lasse Holmstedt's avatar
      3b3df8f6
    • con's avatar
      Merge remote branch 'origin/2.0' · 7f733b15
      con authored
      Conflicts:
      	README
      	doc/qt-html-templates.qdocconf
      	doc/qtcreator.qdoc
      	doc/qtcreator.qdocconf
      	src/app/Info.plist
      	src/plugins/bineditor/BinEditor.pluginspec
      	src/plugins/bookmarks/Bookmarks.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/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/qmlinspector/QmlInspector.pluginspec
      	src/plugins/qmljseditor/QmlJSEditor.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/texteditor/TextEditor.pluginspec
      	src/plugins/vcsbase/VCSBase.pluginspec
      	src/plugins/welcome/Welcome.pluginspec
      7f733b15
    • Friedemann Kleint's avatar
      VCS[svn]: Extract runSVN overload with username/password. · 310194cb
      Friedemann Kleint authored
      to aid trac plugin implementation.
      310194cb
  2. Jun 07, 2010
Loading