feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
11,311 Commits 108 Branches 368 Tags
d9fbf55a985689e9faa1af4e36f9e6fbcd7f3619
Commit Graph

11311 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tobias Hunger
d9fbf55a98 Make Task and TaskWindowPrivate classes 
They both used to be structs.
 2010-06-16 15:16:36 +02:00
Tobias Hunger
bf5c990283 Move ProjectExplorer::Task into its own file 2010-06-16 15:16:24 +02:00
Tobias Hunger
fef02649ce Fix warnings about struct/class mixup 
I know that we agreed to always use class, but ossi and dt both
prefer struct here.
 2010-06-16 13:08:40 +02:00
Tobias Hunger
9b18a58ae5 s/name/displayName/ in ioutputpane 
Reviewed-by: dt
 2010-06-16 13:08:40 +02:00
mae
c29ef11956 Fix Esc handling setFocusToEditor() 
Switching modes was broken.
 2010-06-16 10:43:43 +02:00
Tobias Hunger
ef55312cc3 Fix gnumakeparser unit test 2010-06-16 10:45:21 +02:00
ck
3b315edc2e Maemo: Compile fix. 2010-06-16 09:15:54 +02:00
Leandro Melo
749e97db2b Fixing unit test due to change in the Highlighter's constructor. 2010-06-16 09:10:57 +02:00
Friedemann Kleint
6793f1f962 VCS[git]: Add arguments setting for gitk, add to locator. 
Task-number: QTCREATORBUG-1577
 2010-06-16 09:05:50 +02:00
ck
f96efa07e1 Maemo: Use project file's INSTALLS variable for packaging. 2010-06-16 08:57:13 +02:00
dt
72bd632ca4 Coding style 2010-06-15 14:58:18 +02:00
dt
3fa6aa3008 Fix wrong output in compile output 
Reviewed-By: ossi
 2010-06-15 14:58:18 +02:00
Christian Kamm
7bf0ff8dc2 Merge branch '2.0' 
Conflicts:
	src/plugins/qmljseditor/qmljshighlighter.cpp
 2010-06-15 14:37:46 +02:00
Christian Kamm
983ed48ae3 QmlJS: Don't unnecessarily store the multiline comment state. 
The 'state' value already holds the same information.

Reviewed-by: Erik Verbruggen
(backport of 70448b016d)
 2010-06-15 14:34:18 +02:00
Christian Kamm
70448b016d QmlJS: Don't unnecessarily store the multiline comment state. 
The 'state' value already holds the same information.

Reviewed-by: Erik Verbruggen
 2010-06-15 14:29:45 +02:00
Thorbjørn Lindeijer
3029a2957c Compile fix for ModulesHandler 2010-06-15 13:22:50 +02:00
Thorbjørn Lindeijer
173cdff56c Merge branch '2.0' 
Conflicts:
	src/plugins/cppeditor/cppquickfix.cpp
	src/plugins/mercurial/mercurialjobrunner.cpp
	src/plugins/subversion/subversionplugin.cpp
 2010-06-15 13:22:33 +02:00
Friedemann Kleint
4f45855188 Debugger[CDB]: Compile fix. 2010-06-15 12:55:09 +02:00
hjk
a4f412388d debugger: move m_inferiorPid from DebuggerManager to DebuggerRunControl 2010-06-15 12:51:18 +02:00
hjk
25c11c4ce0 debugger: move SnapshotHandler from DebuggerManager to DebuggerRunControl 2010-06-15 12:48:30 +02:00
Thorbjørn Lindeijer
83dba068ce Avoid triggering indent for electric characters in comments and strings 
In comments and strings, electric characters have no syntactical
significance and the unnecessary automatic reindent can be annoying.

Reviewed-by: Erik Verbruggen
 2010-06-15 12:25:01 +02:00
Thorbjørn Lindeijer
a6e5298591 Fixed handling of text wrapping and a text layout corner case 
Due to using QTextCursor::columnNumber() instead of
QTextCursor::positionInBlock(), a lot of code would not work correctly
when used with wrapped lines.

In addition, there was an issue with columnNumber() returning 0 right
after inserting a character before the last character of a line.

Reviewed-by: mae
 2010-06-15 12:25:01 +02:00
Friedemann Kleint
7332f1e016 Compile fix. 2010-06-15 12:21:01 +02:00
Friedemann Kleint
59592c820c VCS: Do not force LANG=C on all commands. 
Introduce extra flag.

Task-number: QTCREATORBUG-1623
 2010-06-15 12:17:09 +02:00
Friedemann Kleint
c44a0e5999 VCS[Mercurial]: Working directory not set for asynchronous commands. 
Task-number: QTCREATORBUG-1503
 2010-06-15 11:57:05 +02:00
hjk
ff7c543a73 debugger: move RegisterHandler from DebuggerManager to DebuggerRunControl 2010-06-15 11:43:20 +02:00
hjk
12fd2a6091 debugger: move showModuleSymbols from DebuggerManager to DebuggerEngine 2010-06-15 11:43:20 +02:00
hjk
69a4ed3255 debugger: move ModulesHandler from DebuggerManager to DebuggerRunControl 2010-06-15 11:43:20 +02:00
hjk
83e479824e debugger: add model accessors to run control 
Plan is to move the models themselves from DebuggerManager to
DebuggerRunControl.
 2010-06-15 11:43:20 +02:00
Friedemann Kleint
b8c78764e2 VCS[Mercurial]: Remove LANG=C setting 
as it breaks the log output.
Task-number: QTCREATORBUG-1623
 2010-06-15 11:41:43 +02:00
Friedemann Kleint
8c7a54bcce VCS[Subversion]: Remove LANG=C setting 
as it breaks the log output.
Task-number: QTCREATORBUG-1623
 2010-06-15 11:38:09 +02:00
Erik Verbruggen
c364e5522e Merge remote branch 'origin/2.0' 
Conflicts:
	src/plugins/qmljseditor/qmljshighlighter.cpp
	src/plugins/qmljseditor/qmljshighlighter.h
	src/plugins/texteditor/basetextdocumentlayout.cpp
	src/plugins/texteditor/basetextdocumentlayout.h
 2010-06-15 11:33:45 +02:00
Erik Verbruggen
05639e4688 Merge branch 'origin/2.0' (early part) 2010-06-15 11:30:51 +02:00
Erik Verbruggen
e5b9c76f27 Added C-style comment folding. 
This is a "back-port" for 57f2b3e44d from master
into 2.0.

Done-with: ckamm
 2010-06-15 11:27:07 +02:00
Leandro Melo
0894033f93 Coloring white spaces even if there's no highlight syntax definition set. 
Relative to QTCREATORBUG-1225.
 2010-06-15 10:44:15 +02:00
Erik Verbruggen
54ea41af47 Removed implicit change set and related utility methods. 2010-06-15 10:22:28 +02:00
Friedemann Kleint
4d1602cb0a Debugger[CDB]: Re-introduce signal-slot connection for output. 
...to fix multithread crash.
Fix exit crash by temporarily removing output.
 2010-06-15 09:49:22 +02:00
Kai Koehne
512e75a561 QmlDesigner: Fix crash when typing keywords as Ids 
We don't check that an ID entered in the Navigator or Property Editor
is not a JavaScript keyword. This patch revamps the RewritingException
that happens in this case in a InvalidIdException.

Task-number: QTCREATORBUG-1540
 2010-06-15 09:43:18 +02:00
Robert Loehning
5b30072731 Compile fixes 
Wrote down what hjk told me.
 2010-06-14 19:09:18 +02:00
hjk
d26b53e1b9 debugger: more message channeling 2010-06-14 18:40:05 +02:00
hjk
bc65bb2897 debugger: remove unneeded stale connections 2010-06-14 18:24:06 +02:00
hjk
9f7e9dc0ae debugger: refactoring of output channeling 2010-06-14 18:22:09 +02:00
Christiaan Janssen
254a51bf5a QmlDesigner.StatesEditor: speed up by only updating thumbnails after rewritter transactions are finished 2010-06-14 18:20:45 +02:00
Erik Verbruggen
81c7f4f166 Removed qDebug. 2010-06-14 18:10:03 +02:00
kh1
106d111f9b Fixes broken attribute list for real. 
Task-number: QTCREATORBUG-1621
 2010-06-14 18:07:20 +02:00
hjk
b3aff6b919 debugger: more of the RunControl refactoring 
Pass output through the RunControl instead of the DebuggerManager.
 2010-06-14 17:24:13 +02:00
hjk
6ed9830971 debugger: move DebuggerRunControl *m_runControl into IDebuggerEngine. 
Plan is to identify make identify an IDebuggerEngine incarnation with
a RunControl.
 2010-06-14 17:24:13 +02:00
Erik Verbruggen
f3faf34db9 Removed implicit change set and related utility methods. 2010-06-14 17:16:45 +02:00
kh1
3cf8d21115 Fix build without webkit. 2010-06-14 16:57:53 +02:00
kh1
27daa542d3 We need to check for http only. 2010-06-14 16:57:52 +02:00