Commit Graph

13 Commits

Author SHA1 Message Date
Christian Kamm
b78c1ef6da Merge remote branch 'origin/2.1'
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
2010-10-11 14:16:33 +02:00
hjk
373da663a4 debugger: compile fix for manual test 2010-10-08 14:56:17 +02:00
hjk
f3dfc8915d debugger: add python dumper for QFixed
Reviewed-by: Alessandro Portale
2010-10-08 14:26:44 +02:00
hjk
0ad538ebfb debugger: test gcc RVO bug not too extensively 2010-10-08 13:50:04 +02:00
dt
6b6d9871b8 Merge remote branch 'origin/2.1'
Conflicts:
	share/qtcreator/templates/mobileapp/app.pro
	share/qtcreator/templates/qmlapp/app.pro
	src/plugins/cpptools/cpptools.pro
2010-10-04 16:07:46 +02:00
Friedemann Kleint
ccecfd701e Debugger: Fix manual test.
to work at least for debug-in-source builds.

Reviewed-by: hjk
Task-number: QTCREATORBUG-2546
2010-10-04 12:19:28 +02:00
hjk
9c31719c09 debugger: add manual test for QTextCursor and QTextDocument dumper 2010-09-28 09:35:59 +02:00
hjk
8672cbec8b debugger: add a manual QDate and QTime test 2010-09-27 13:24:57 +02:00
hjk
f793943371 debugger: manual test: add object names to threads test 2010-09-14 18:31:07 +02:00
hjk
7457083bab debugger: only update variables that are operated on 2010-09-13 08:32:37 +02:00
hjk
7528b3b022 debugger: fix editing of breakpoint conditions 2010-09-08 12:18:04 +02:00
Kai Koehne
b0bc76ece0 GdbTest: Compile fix 2010-09-03 12:29:41 +02:00
Bill King
1f0b600b82 Autotests: More cleanup of tests, and initial marking of components belonged to. 2010-09-02 15:32:04 +10:00