Commit Graph

104 Commits

Author SHA1 Message Date
con
b1bcf081d8 Merge branch '2.1'
Conflicts:
	src/plugins/coreplugin/basemode.cpp
	src/plugins/coreplugin/basemode.h
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h
	src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp
	src/plugins/debugger/debuggeragents.cpp
	src/plugins/debugger/debuggeruiswitcher.cpp
	src/plugins/debugger/debuggeruiswitcher.h
	src/plugins/projectexplorer/buildconfigdialog.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.h
	src/plugins/qmldesigner/designercore/include/enumeratormetainfo.h
	src/plugins/qmldesigner/designercore/include/modelutilities.h
	src/plugins/qmldesigner/designercore/include/nodeinstance.h
	src/plugins/qmldesigner/designercore/include/propertymetainfo.h
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.h
	src/plugins/qmldesigner/designercore/instances/graphicsviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.h
	src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/qmlviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.h
	src/plugins/qmldesigner/designercore/metainfo/enumeratormetainfo.cpp
	src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp
	src/plugins/qmldesigner/designercore/model/modelutilities.cpp
	src/plugins/snippets/inputwidget.cpp
	src/plugins/snippets/snippetscompletion.cpp
	src/plugins/snippets/snippetscompletion.h
	src/plugins/snippets/snippetspec.cpp
	src/plugins/snippets/snippetsplugin.cpp
	src/plugins/snippets/snippetswindow.cpp
	src/plugins/snippets/snippetswindow.h
	src/plugins/texteditor/snippetsparser.cpp
	src/tools/qml/qmldom/main.cpp
	tests/manual/trk/runner.cpp
	tests/manual/trk/trkolddevice.cpp
	tests/manual/trk/trkolddevice.h
	tests/manual/trk/trkserver.cpp
2010-12-17 17:00:53 +01:00
con
04e32b0049 License headers. 2010-12-17 16:03:42 +01:00
Roberto Raggi
b4e421062f Removed stray tokens and fixed warnings/errors when compiling with pedantic C++ compilers. 2010-12-16 12:05:48 +01:00
Friedemann Kleint
191b7e0b00 Debugger[new CDB]: Work on locals.
Add optional code model scope checking. Remove need to call
to 'expandlocals' command by giving 'locals' options for expanded
and uninitialized variables, saving one roundtrip.
Handle shadowed variables and __formal parameters. Differentiate
between name and iname in SymbolGroup.
2010-11-23 13:36:39 +01:00
Friedemann Kleint
4ac2634de7 Debugger: Make Gdbmi threads parsing code re-usable.
Adapt watchutils code for new engine.

Acked-by: hjk
2010-11-08 17:15:33 +01:00
Friedemann Kleint
3d1f23b78b Debugger: Add Run to/Jump to Line to text editor context menu.
Remove actions from debugger plugin as they are not directly usable.
Create additional actions in context menu.

Move some code around to find the current editor.
2010-11-04 11:46:16 +01:00
Arvid Ephraim Picciani
4d14920ad6 clean up WatchData
Reviewed-by: hjk
2010-10-15 15:19:11 +02:00
hjk
7a4ca5b879 debugger: fix recently introduced off-by-one in gdbmi child parsing
Reviewed-by: Friedemann Kleint
2010-10-12 11:31:15 +02:00
Friedemann Kleint
edeccf7307 Debugger: Fix dumpers in case alphabetical sorting is off.
No longer change iname to obtain sorting.

Reviewed-by: hjk
2010-10-08 14:57:39 +02:00
Friedemann Kleint
13c97d652e Debugger: Fixes around watch editing.
assignValueInDebugger: Pass on WatchData as well, pass
on values as QVariant. Based on that, do more extensive
checks in CDB, preventing assignment of non-PODs.

Locals/Watch editing:
* Disable while running
* Edit pointer values as hex with validation.

CDB: Strip class types off reported pointer values and reformat
the values as short 0x-pointer values, introduce flag to
WatchData::source to do dumper expansion handling.

Windows: recognize int64 as int.

Register handler: Fix accessing uninitialized value.
2010-09-23 13:22:08 +02:00
hjk
034bb72dc4 debugger: make alphabetic sorting of struct members optional.
Task-number: QTCREATORBUG-1608
2010-09-23 11:17:01 +02:00
Friedemann Kleint
ca808cc7b4 Debugger: Add special widgets for editing watch values.
Create delegate widgets with validation for bool/int/float
types, using a QVariant-type modelData property.
Also fix register editing to be validated for quint64 values
and editing longer values as hex bigints. Anything else is not
editable.
2010-09-22 17:30:22 +02:00
Friedemann Kleint
b67c1a7889 Debugger: Sanitize Datatypes, part 3: Address of watch items.
Use a quint64 as address. Split apart special handling of
QAbstractItemModels of old shared-library based dumpers
(passing '$'+ special expression as address) into separate
dumperFlags QByteArray.
2010-09-22 11:19:35 +02:00
Arvid Ephraim Picciani
98736d256b Display thread names
extract thread names from QThread object name

Task-Number: QTCREATORBUG-382
Reviewed-by: hjk
2010-09-13 13:42:14 +02:00
hjk
ad95e3372d debugger: fix recently introduced regression with compiled dumpers.
'+' instead of '+='. Duh.
2010-09-08 10:26:17 +02:00
hjk
46aa04dcb4 debugger: robustness 2010-09-01 18:55:59 +02:00
hjk
4cbbe366af debugger: make a 'type' a QByteArray, not a QString
Saves lots of conversion.
2010-09-01 17:36:09 +02:00
hjk
d5ff2bb55f debugger: make std::size_t and std::ptrdiff_t also 'well known integer types' 2010-09-01 17:19:55 +02:00
hjk
7b5b60ff8a debugger: code cosmetics 2010-08-27 17:24:22 +02:00
hjk
8fb377a3d6 debugger: code cosmetics 2010-08-27 17:24:22 +02:00
Roberto Raggi
16b1e8b40d Renamed Symboo::isScopedSymbol(). 2010-08-12 12:35:22 +02:00
Roberto Raggi
2ebaf3fe5b Get rid of the #warning directives. 2010-08-11 15:48:40 +02:00
Roberto Raggi
354b9712e4 Merged ScopedSymbol and Scope. 2010-08-11 15:25:18 +02:00
Roberto Raggi
4ff3ee2ff0 Use Prototype instead of Function. 2010-08-05 17:53:14 +02:00
hjk
f292254967 debugger: attempt to re-try examining dumper location after build.
Still does not work as the location itself is unknown.
2010-07-21 12:07:49 +02:00
con
d24d01f49c Merge commit '52b9fcca2ddd5d5e95c6e13cbded018699c7dd68' (origin/2.0)
Conflicts:
	src/plugins/debugger/debuggeragents.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.h
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemosshthread.h
2010-07-13 11:31:05 +02:00
hjk
2f2f3c2abf debugger: fix decoding of %04x encoded 16 bit big endian data. 2010-07-09 11:00:20 +02:00
Erik Verbruggen
e3e8b1a5c0 Removed the TokenCache. 2010-07-02 11:18:51 +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
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
Erik Verbruggen
e42ca194c5 Introduced token caching to prevent repetetive tokenizing.
Also removed TokenUnderCursor as it's functionality is in the token cache.

Reviewed-by: ckamm
2010-06-14 10:10:05 +02:00
Bill King
9e7d91a519 Fix missing breaks which lead to invalid fallthroughs. 2010-06-11 13:39:47 +10:00
Erik Verbruggen
424b9724d6 Revert "Introduced a token cache for the C++ editor."
This reverts commit c2393df023.
2010-06-04 12:37:26 +02:00
Erik Verbruggen
c2393df023 Introduced a token cache for the C++ editor.
This should speed things up a bit, because before, the line was tokenized at
least 3 times.
2010-06-04 09:36:05 +02:00
Roberto Raggi
18490596f9 Renamed Document::findSymbolAt(). 2010-05-17 13:01:56 +02:00
hjk
9a8ac49c2c debugger: new files for WatchData; move potentially shared code to watchutils.cpp 2010-04-27 15:33:22 +02:00
hjk
59af793953 debugger: polish address display. also remove the mostly unused 'stored' address 2010-03-23 14:48:32 +01:00
Friedemann Kleint
083988b2c9 Debugger[CDB]: Fixes for Debugging Tools for Windows 6.12
Handle the new version's formatting of integer types as '0n...'.
List shorts as int-types.
2010-03-23 14:00:56 +01:00
hjk
463ac5d689 debugger: start reviving graphical data display 2010-03-15 12:12:43 +01:00
hjk
c8a61cc8f2 debugger: implement selected of string encoding per pointer type/individual pointer 2010-03-11 18:56:28 +01:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
hjk
ed4278aba3 debugger: fix new wstring dumper encoding 2010-03-05 11:11:20 +01:00
Friedemann Kleint
2fd8b2d7ff Fix some code scanning issues.
QString: Use QChar where appropriate.
2010-02-01 12:43:56 +01:00
Oswald Buddenhagen
75b42f18d8 Merge remote branch 'origin/1.3'
Trailing whitespace removal re-applied manually.
2010-01-29 22:50:23 +01:00
Oswald Buddenhagen
a6ca348636 remove trailing whitespace
doing it in 1.3 as well to avoid possible later conflicts
2010-01-29 21:33:57 +01:00
hjk
e3712f9687 debugger: refactoring, use QByteArray instead of QString when appropriate 2010-01-05 18:13:24 +01:00
hjk
32d3db8200 debugger: special handling for char* 2009-12-07 12:07:10 +01:00
Roberto Raggi
14376c3c32 Initial work on the new CPlusPlus::Snapshot.
Encapsulate the details.
2009-12-07 10:54:27 +01:00
Oswald Buddenhagen
9c66c06820 mi parser: don't construct dummy tuples, but parse lists directly 2009-11-30 15:55:11 +01:00
Friedemann Kleint
2b23ea2a8a Debugger/CDB: Windows 64 integer handling.
Convert CDB unsigned integer values should they appear in hex,
make format flexible.
Use int64 for reformatting integers to be able to accommodate
64 bit values on Windows 64. Add some more integer types.
Do not save decimal type formats. Add menu option to clear
individual formatting. Do not use map[] to query the type formats
(inserting 0 everywhere as a side effect).

Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2009-11-25 16:32:44 +01:00