Eike Ziller
236ea9efb9
Merge remote-tracking branch 'origin/3.0'
...
Conflicts:
share/qtcreator/debugger/dumper.cpp
share/qtcreator/debugger/dumper_p.h
share/qtcreator/debugger/test/main.cpp
src/plugins/debugger/gdb/classicgdbengine.cpp
src/plugins/debugger/gdb/pythongdbengine.cpp
src/plugins/debugger/lldblib/guest/lldbengineguest.cpp
src/plugins/debugger/lldblib/guest/lldbengineguest.h
src/plugins/debugger/lldblib/guest/main.cpp
src/plugins/debugger/lldblib/ipcengineguest.cpp
src/plugins/debugger/lldblib/ipcengineguest.h
src/plugins/debugger/lldblib/ipcenginehost.cpp
src/plugins/debugger/lldblib/ipcenginehost.h
src/plugins/debugger/lldblib/lldbenginehost.cpp
src/plugins/debugger/lldblib/lldboptionspage.cpp
src/plugins/qbsprojectmanager/qbsstep.cpp
src/plugins/qbsprojectmanager/qbsstep.h
src/plugins/qmlprofiler/canvas/qdeclarativecanvas.cpp
src/plugins/qmlprofiler/canvas/qdeclarativecanvas_p.h
src/plugins/qmlprofiler/canvas/qdeclarativecontext2d.cpp
src/plugins/qmlprofiler/canvas/qdeclarativecontext2d_p.h
src/plugins/qmlprofiler/canvas/qmlprofilercanvas.cpp
src/plugins/qnx/blackberrycheckdevmodestep.cpp
src/plugins/qtsupport/debugginghelper.cpp
Change-Id: Ie9fd0a885fb6264a6a8a72daee071b75bcbd2e9d
2014-01-08 11:01:06 +01:00
Robert Loehning
746c5d8863
Incremented year in copyright info
...
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com >
Reviewed-by: Kai Koehne <kai.koehne@digia.com >
2014-01-08 08:29:47 +01:00
Eike Ziller
1adab4c4cc
Merge BaseTextEditorWidget::editorDocument() and ::baseTextDocument()
...
Doesn't really make sense to have the additional IDocument *editorDocument()
method.
Change-Id: I0a7420eb1afaa76f63c3f7e9c4b373acf624ffb9
Reviewed-by: Eike Ziller <eike.ziller@digia.com >
2013-12-18 11:34:34 +01:00
Tobias Hunger
4da06735dc
Python: Do not export symbols
...
Nothing depends on this plugin, so these exports are not needed.
Change-Id: I7a6c1c6fd1dd355c904d2dcb6d3f0522cf30adcd
Reviewed-by: hjk <hjk121@nokiamail.com >
2013-08-26 16:26:03 +02:00
hjk
4e75fc8c54
TextEditor: Simplify Utils::CommentDefinition structure
...
Change-Id: I8fc97ed61c47af2c3d9e5cc2bf81e97661204d4f
Reviewed-by: David Schulz <david.schulz@digia.com >
2013-05-27 08:35:46 +02:00
Sergey Shambir
687a546972
PythonEditor: fixed 100% crash in editor
...
removed erroneous #ifdef
Change-Id: I6b5b4c70f7dde3ddbf7e6e4270d332c50ad6d30a
Reviewed-by: Orgad Shaneh <orgads@gmail.com >
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2013-03-19 19:50:52 +01:00
Friedemann Kleint
dc1f0b0752
Fix Krazy warnings about includes/header guards in Python Editor.
...
Change-Id: I3dce1d8f14d4bfc271d8873eb3ad819eb336e2df
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com >
2013-03-12 16:18:45 +01:00
Sergey Shambir
04b9d7614e
Added PythonEditor plugin
...
Contains lexical highlighter, indenter and file wizard.
Icon loaded from theme, if possible.
Class wizard will be added later since it needs to extend libUtils.
Change-Id: If723867c01e9be83371424e406d116805c88c2b0
Reviewed-by: hjk <hjk121@nokiamail.com >
2013-02-07 10:17:09 +01:00
