hjk
5c44689793
fakevim: cleanup 'r' handling
2010-05-28 13:16:13 +02:00
Oswald Buddenhagen
123937fb2a
Merge remote branch 'origin/2.0'
2010-05-28 12:45:41 +02:00
Erik Verbruggen
3082395c14
Disabled invalid ObjC++ discovery code.
...
Task-number: QTCREATORBUG-1501
Reviewed-by: Roberto Raggi
2010-05-28 12:15:54 +02:00
Roberto Raggi
e343b33342
Check for possible 0x0 accesses.
2010-05-28 11:15:08 +02:00
Robert Loehning
49d5cacd35
Don't call QDirIterator::filePath() twice
2010-05-27 21:23:44 +02:00
Roberto Raggi
75bcf2bc66
Speedup global completion.
...
Don't sort the global completion items when we have too many of them, instead
populate the completion box in a way where local symbols are showed before
global symbols.
2010-05-27 19:00:44 +02:00
dt
69bd2df4e4
Fix QMAKE_CXX parsing
...
Task-Nr: QTCREATORBUG-1411
2010-05-27 16:36:26 +02:00
Roberto Raggi
64e9f652e0
Handle using declarations
2010-05-27 16:33:18 +02:00
Thorbjørn Lindeijer
de7af4f22b
Fixed the default UI color
...
When there was no existing configuration, it would get set to pure black
on startup, resulting in a very dark gray Qt Creator. Now it is back to
its old friendly gray as default color.
Also made sure that the default on startup and the color used for
resetting the UI color in the settings are always in sync.
Reviewed-by: Jens Bache-Wiig
2010-05-27 16:21:29 +02:00
hjk
5afeaa720d
debugger: more robust version string parsing
...
Fix for QTCREATORBUG-1490
Reviewed-By: Friedemann Kleint
2010-05-27 15:55:01 +02:00
Bill King
9cde6baebc
Fix invalid delete shown up by coverity scanning.
2010-05-27 15:20:50 +02:00
Thorbjørn Lindeijer
ee6d7ae384
Fixed position of current argument highlight for constructors
...
It was broken due to a leading space which was trimmed off, breaking the
begin and end positions. Instead, don't trim, but just make sure not to
add a leading space when it is not necessary.
Done-with: Christian Kamm <christian.d.kamm@nokia.com >
Task-number: QTCREATORBUG-1398
2010-05-27 14:49:45 +02:00
Daniel Molkentin
272de3b881
Rewording due to ambiguity. Breaks string freeze.
...
Reviewed-by: Oswald Buddenhagen
2010-05-27 14:26:43 +02:00
Erik Verbruggen
25d7933d7a
Fixed __attribute__ parsing after struct declarations.
...
Task-number: QTCREATORBUG-1358
Reviewed-by: Roberto Raggi
2010-05-27 14:22:53 +02:00
Thorbjørn Lindeijer
f089b93029
Switched completion to be case-insensitive by default
...
Quite a few people seem to prefer this and it is the default in Eclipse
and MSVC.
This applies to both C++ and QML completion.
Task-number: QTCREATORBUG-1474
2010-05-27 14:21:26 +02:00
Thorbjørn Lindeijer
3bc20dbb60
Fixed vertical alignment of line numbers in search results on Mac
...
Due to different text positioning logic between the QItemDelegate and
the way SearchResultTreeItemDelegate drew the line numbers, the line
numbers did not align properly to the line of text next to it.
This was fixed by relying on QItemDelegate::drawDisplay for drawing the
line numbers, so that the same positioning logic is used.
This exposed a small right-alignment bug in QTextLayout, for which a fix
is coming to Qt.
Done-with: Erik Verbruggen
2010-05-27 13:49:36 +02:00
Friedemann Kleint
647c5d9b63
ProjectExplorer: Header cleanup in Taskwindow.
...
Introduce TaskWindowPrivate, add and reformat some
comments.
2010-05-27 13:28:07 +02:00
Christian Kamm
57f2b3e44d
QmlJS: Allow folding of multi-line comments.
...
This also makes the editor auto-fold the license comment.
Task-number: QTCREATORBUG-1455
Reviewed-by: Erik Verbruggen
2010-05-27 12:56:44 +02:00
hjk
385034722c
fix latest merge from 2.0
2010-05-27 12:18:32 +02:00
Bill King
b201dcb584
Fix issues in botan shown up by a coverity scan
...
Reviewed-by: kh
2010-05-27 12:15:53 +02:00
dt
fc4e7b2e6d
Oh well symbian doesn't support dots in dirs
2010-05-27 11:53:04 +02:00
Thomas Hartmann
3d01b6af69
QmlDesigner.propertyEditor: remove ambigous typedef
...
Reviewed-by: Kai Koehne
2010-05-27 11:48:02 +02:00
Thomas Hartmann
7f6601951c
QmlDesigner.propertyEditor: cleanup of includes
...
Reviewed-by: Kai Koehne
2010-05-27 11:48:01 +02:00
hjk
5805788290
Merge remote branch 'origin/2.0'
...
Conflicts:
src/plugins/projectexplorer/miniprojecttargetselector.cpp
src/plugins/qmldesigner/designercore/model/modeltotextmerger.cpp
src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp
src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp
src/plugins/qt4projectmanager/qt-maemo/maemosshthread.h
tests/manual/gdbdebugger/simple/app.cpp
2010-05-27 11:11:53 +02:00
Leandro Melo
125aaf8615
Settings page for the generic highlighter.
2010-05-27 09:54:59 +02:00
Oswald Buddenhagen
0b52a873bd
escape backslashes (or don't use them at all, resp.)
2010-05-26 19:35:21 +02:00
mae
7c82944750
Fix qml autocompletion on Enter
...
Only insert necessary newlines
Reviewed-by: thorbjorn
Task-number: QTCREATORBUG-1476
2010-05-26 19:21:32 +02:00
mae
154b312de6
Fix qml autocompletion on Enter
...
Only insert necessary newlines
Reviewed-by: thorbjorn
Task-number: QTCREATORBUG-1476
2010-05-26 19:19:42 +02:00
Roberto Raggi
653ca110fe
Removed DeprecatedLookupContext.
2010-05-26 15:56:12 +02:00
Erik Verbruggen
54e09a1802
Changed C++ code completion to use the new LookupContext.
2010-05-26 15:51:29 +02:00
Roberto Raggi
b39d48fcc9
Removed unused code.
2010-05-26 15:39:19 +02:00
Roberto Raggi
d702119dca
Revert "Sort the items lazily."
...
This reverts commit 13a721d985 .
2010-05-26 15:14:50 +02:00
Roberto Raggi
30e1d00725
Revert "Clear the completion."
...
This reverts commit bb35b4d081 .
2010-05-26 15:14:40 +02:00
Roberto Raggi
bb35b4d081
Clear the completion.
2010-05-26 14:47:04 +02:00
Roberto Raggi
13a721d985
Sort the items lazily.
2010-05-26 14:44:16 +02:00
Kai Koehne
2630fc2aed
QuickDesigner: Fix drag & drop in Navigator on Mac OS X
...
Task-number: BAUHAUS-651
2010-05-26 14:42:55 +02:00
Friedemann Kleint
ef5b4b8ec5
Debugger: Introduce env QTC_DEBUGGER_PYTHON_VERBOSE
...
for verbose python error hunting.
Rubber-stamped-by: hjk
2010-05-26 14:35:06 +02:00
Roberto Raggi
db7333e6bb
Sort the completion items as soon as we have them.
2010-05-26 14:25:45 +02:00
Erik Verbruggen
dfadb0d076
Added support for the GCC "unavailable" attribute.
2010-05-26 13:56:34 +02:00
Roberto Raggi
49c75444bd
Removed obsolete code.
2010-05-26 13:55:10 +02:00
Erik Verbruggen
51fbf9695c
Added support for the GCC "unavailable" attribute.
2010-05-26 13:49:06 +02:00
Jens Bache-Wiig
ce5f0a39ae
Cache the welcomemode background
...
I now cache the scaled welcomemode background so it feels more
responsive when toggeling back and forth between modes.
Reviewed-by: joao
2010-05-26 12:50:11 +02:00
Roberto Raggi
9e89f36cd9
There's no need to sort after filtering the completion.
2010-05-26 12:46:41 +02:00
Erik Verbruggen
77bd9e2996
Fixed compression bugs in text refactoring.
...
Task-number: BAUHAUS-729, BAUHAUS-731
2010-05-26 12:42:53 +02:00
Erik Verbruggen
79cbc07b29
Fixed superfluous (and erroneous) semi-colon insertion.
...
Bug: BAUHAUS-674
2010-05-26 12:42:53 +02:00
Erik Verbruggen
e997f6de13
Fixed rewriter bug for subsequent reparent-in-out actions.
2010-05-26 12:42:53 +02:00
Roberto Raggi
040e2a3049
Ported global completion to use the new LookupContext.
2010-05-26 12:35:40 +02:00
Roberto Raggi
6578099982
Speedup the creation of the extra selections.
2010-05-26 12:35:40 +02:00
ck
fd212978ac
Maemo: Fix trailing garbage output at end of remote process.
...
Task-number: QTCREATORBUG-1461 (part 2)
Written-by: Denis Mingulov
2010-05-26 12:12:58 +02:00
ck
fae7a9fae7
Maemo: Add missing initialization.
...
Task-number: QTCREATORBUG-1461 (part 1)
Conflicts:
src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp
src/plugins/qt4projectmanager/qt-maemo/maemosshthread.h
2010-05-26 12:12:41 +02:00