feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
6,724 Commits 108 Branches 368 Tags
5723682b218b1de51a966df269c3ccefd9dfcb22
Commit Graph

6724 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Verbruggen
5723682b21 Fixes for highlighting locals in Objective-C methods. 2010-01-06 17:39:35 +01:00
Friedemann Kleint
7c0f4e8f50 VCS[SVN, CVS, Perforce]: Implement "Annotate Previous" context menu. 
in annotation editor, including base infrastructure in
VCSBaseEditor. Pass signals of VCSBaseEditor to opaque
VCSBaseEditable (IEditor) for convenience.

Task-number: QTCREATORBUG-503
 2010-01-06 17:24:40 +01:00
hjk
0afaf1f2f1 debugger: work around spurious additions to gdb.Value.address 2010-01-06 17:01:16 +01:00
hjk
270defaf59 debugger: go back to explicitly named pointers 2010-01-06 16:38:10 +01:00
hjk
d3d4a4d65b debugger: constant simple types are also simple 2010-01-06 16:17:27 +01:00
Roberto Raggi
83d5659454 Fixed parsing of friend class declarations. 2010-01-06 16:15:28 +01:00
con
c4ba8a021b Make git ignore generated API doc 2010-01-06 16:11:32 +01:00
con
ae6341a9fc Merge remote branch 'origin/1.3' 
Conflicts:
	src/plugins/debugger/debuggeractions.cpp
	src/plugins/debugger/debuggerplugin.cpp
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/debugger/watchhandler.cpp
 2010-01-06 16:05:56 +01:00
con
ea2101950f debugger: move watchdog timeout initialization to a place where it actually can access the stored settings. 
(cherry picked from commit de23834fc9)

Conflicts:

	src/plugins/debugger/gdb/gdbengine.cpp
 2010-01-06 15:57:11 +01:00
hjk
e80e5e5580 debugger: fix thinko in time out computation 
(cherry picked from commit 33bdf42953)
 2010-01-06 15:57:11 +01:00
con
db68ca5b8d debugger: gracefully handle commands that might not produce output 
(cherry picked from commit 1324a1c600)

Conflicts:

	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/debugger/gdb/gdbengine.h
 2010-01-06 15:57:10 +01:00
con
0de840cb43 debugger: make watchdog timeout configurable 
(cherry picked from commit bf077800b8)

Conflicts:

	src/plugins/debugger/debuggerplugin.cpp
	src/plugins/debugger/gdb/gdboptionspage.ui
 2010-01-06 15:57:10 +01:00
hjk
ca637fdc33 debugger: make use of full source file list optional 
(cherry picked from commit 8c52f5720c)
 2010-01-06 15:57:10 +01:00
con
769c51504c debugger: handle large quint64 values 'properly' 
(cherry picked from commit 02e90fd71d)

Conflicts:

	src/plugins/debugger/watchhandler.cpp
 2010-01-06 15:57:10 +01:00
con
1906319940 debugger: make the option to write timestamps to the log persistent 
(cherry picked from commit a5c5cfc42e)

Conflicts:

	src/plugins/debugger/debuggerplugin.cpp
 2010-01-06 15:57:10 +01:00
Martin Aumüller
f289da3d91 fakevim: implement smart indent 
use creator's indenter for smartindent mode
- this works like automatic indent w/o fakevim

perhaps this fixes QTCREATORBUG-139

Merge-request: 98
Reviewed-by: hjk <qtc-committer@nokia.com>
 2010-01-06 15:21:17 +01:00
Martin Aumüller
0b49fb310f fakevim: creator auto indent is more like vim's smartindent 
Merge-request: 98
Reviewed-by: hjk <qtc-committer@nokia.com>
 2010-01-06 15:21:17 +01:00
Martin Aumüller
c4fede0fd3 fakevim: use BaseTextEditor's isElectricCharacter 
in order for automatic indenting to work, isElectricCharacter has to match the language of the document

Merge-request: 98
Reviewed-by: hjk <qtc-committer@nokia.com>
 2010-01-06 15:21:17 +01:00
Martin Aumüller
46abe329f4 make isElectricCharacter public 
the fakevim plugin needs access to this method for automatic indenting as the implementation
differs across the different types of editors

Merge-request: 98
Reviewed-by: hjk <qtc-committer@nokia.com>
 2010-01-06 15:21:17 +01:00
hjk
85b4b826ab debugger: use '*' as name for all pointers, add pointee only for display purposes 2010-01-06 15:21:17 +01:00
Daniel Molkentin
6ced1c3e75 Language switcher: Add English as explicit translation. 
Complements f093025ff3

Reviewed-By: Oswald Buddenhagen
 2010-01-06 14:56:48 +01:00
Thorbjørn Lindeijer
97eabc2916 Merge branch '1.3' 2010-01-06 14:46:22 +01:00
Friedemann Kleint
a3fd049ec8 PLain Text Editor: Remove list indentation 
As it causes dashed lists to be formatted as
- i1
  - i2
Just do paragraph formatting.

Task-number: QTCREATORBUG-538
Initial-patch-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
(cherry picked from commit 2986ccafd2)
 2010-01-06 14:37:39 +01:00
Thorbjørn Lindeijer
2ab738cd7a Small indentation fix 2010-01-06 14:34:36 +01:00
Roberto Raggi
d510aaa029 Fixed problem with nested templates in function declaration completion 
Wasn't using a space to separate the closing angular brackets.

Task-number: QTCREATORBUG-547
Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
 2010-01-06 14:29:51 +01:00
Friedemann Kleint
d10b4edaab Gdb/MingW: Fix interrupting inferior. 
Prevent exec-continue by SIGTRAP-Handler.
Reviewed-by: hjk <qtc-committer@nokia.com>
 2010-01-06 14:16:35 +01:00
Friedemann Kleint
2986ccafd2 PLain Text Editor: Remove list indentation 
As it causes dashed lists to be formatted as
- i1
  - i2
Just do paragraph formatting.

Task-number: QTCREATORBUG-538
Initial-patch-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
 2010-01-06 13:53:50 +01:00
Erik Verbruggen
73a447ff5e Fixed fix for QTCREATORBUG-509. 2010-01-06 13:05:27 +01:00
hjk
e5abb34db3 debugger: fix watchers containing '$' (references to registers) 2010-01-06 12:53:37 +01:00
Roberto Raggi
0fdb3bebee Fixed crash when completing symbols without a valid context. 
Task-number: QTCREATORBUG-534
Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
 2010-01-06 12:32:29 +01:00
hjk
456abf4cbb debugger: fix disassembler command (regression introduced in e3712f968) 2010-01-06 12:17:34 +01:00
Jarek Kobus
738a950b75 Load designer translations before instantiating any designer object 
In this way all tr calls are done after translations are loaded.

Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@trolltech.com>
Task-number: QTCREATORBUG-470
 2010-01-06 11:33:45 +01:00
Roberto Raggi
6d47004cc3 Added BaseType::setType() 2010-01-06 11:24:50 +01:00
Daniel Molkentin
7a0313ed9e Brown paper bag fix for 8929bb27ee. 
(cherry picked from commit a866725405)
 2010-01-06 10:57:49 +01:00
Daniel Molkentin
1644f8ea81 Point some tips of the day to the right documentation path. 
Fixes: QTCREATORBUG-483
(cherry picked from commit 8929bb27ee)
 2010-01-06 10:57:38 +01:00
con
615d705440 More changes. 2010-01-06 10:57:22 +01:00
Friedemann Kleint
ce684eb664 SVN: Pass "--parent" to "add" to automatically add directories. 2010-01-06 10:57:07 +01:00
Tobias Hunger
a3113da32c Add copyright headers. 
Reviewed-by: Roberto Raggi
 2010-01-06 10:25:16 +01:00
hjk
b6cae42a62 fakevim: remove spurious executable attributes; also some style issues 2010-01-05 18:48:53 +01:00
Martin Aumüller
f08176cc49 fakevim: [num]'-'/'+' moves to first non-blank of previous/next but ([num]-1)th line 
Merge-request: 96
Reviewed-by: hjk <qtc-committer@nokia.com>
 2010-01-05 18:48:53 +01:00
Martin Aumüller
29236ea356 fakevim: leave visual mode if entering insert mode 
Merge-request: 96
Reviewed-by: hjk <qtc-committer@nokia.com>
 2010-01-05 18:48:53 +01:00
Martin Aumüller
7ccdbc5e97 fakevim: fix indenting 
- the indented region has been off by one line as lineForPosition returns 1-based line numbers but QTextDocument::findBlockByNumber expects base 0
- all lines (including first and last line) have to be indented
- if text is collapsed, then findBlockByNumber has to be used instead of findBlockByLineNumber for getting the block containing a line

Merge-request: 96
Reviewed-by: hjk <qtc-committer@nokia.com>
 2010-01-05 18:48:53 +01:00
Martin Aumüller
a088b01713 fakevim: fix undo for indenting 
previously, indenting would have been undone line by line

Merge-request: 96
Reviewed-by: hjk <qtc-committer@nokia.com>
 2010-01-05 18:48:53 +01:00
Martin Aumüller
a04137f39a fakevim: 'dG' at the end of the document should delete the last line 
make sure that when deleting line-wise, a complete line is deleted,
even at the end of the document

Merge-request: 96
Reviewed-by: hjk <qtc-committer@nokia.com>
 2010-01-05 18:48:53 +01:00
Martin Aumüller
c71c338e72 fakevim: common implementation of 'G' and 'gg' 
Merge-request: 96
Reviewed-by: hjk <qtc-committer@nokia.com>
 2010-01-05 18:48:53 +01:00
Martin Aumüller
f6619d0087 fakevim: some 'dG' and 'dgg' auto tests 
Merge-request: 96
Reviewed-by: hjk <qtc-committer@nokia.com>
 2010-01-05 18:48:52 +01:00
Martin Aumüller
c7281909c1 fakevim: [lineno]gg should behave as [lineno]G 
Merge-request: 96
Reviewed-by: hjk <qtc-committer@nokia.com>
 2010-01-05 18:48:52 +01:00
Martin Aumüller
159e3f613d fakevim: fix 'yj', 'dj', 'cj' and 'yk', 'dk', 'ck' 
Merge-request: 96
Reviewed-by: hjk <qtc-committer@nokia.com>
 2010-01-05 18:48:52 +01:00
Martin Aumüller
489a21a143 fakevim: auto tests for 'dj', 'dk', 'cj', 'ck' 
Merge-request: 96
Reviewed-by: hjk <qtc-committer@nokia.com>
 2010-01-05 18:48:52 +01:00
Martin Aumüller
e95692b599 fakevim: fix 'c$', 'd$', 'y$', 'C', 'D' at end of line 
Merge-request: 96
Reviewed-by: hjk <qtc-committer@nokia.com>
 2010-01-05 18:48:52 +01:00