OSDN Git Service
hjk [Thu, 2 Dec 2010 18:36:46 +0000 (19:36 +0100)]
debugger: compile fix
hjk [Thu, 2 Dec 2010 17:23:53 +0000 (18:23 +0100)]
debugger: remove unused member
hjk [Thu, 2 Dec 2010 17:21:39 +0000 (18:21 +0100)]
debugger: don't store m_debugMenu container explicitly
hjk [Thu, 2 Dec 2010 17:19:05 +0000 (18:19 +0100)]
debugger: simplify DebuggerMainWindow
hjk [Thu, 2 Dec 2010 17:05:34 +0000 (18:05 +0100)]
debugger: the 'Memory Editor' action does not need to be stored explicitly
hjk [Thu, 2 Dec 2010 17:02:55 +0000 (18:02 +0100)]
debugger: move some private bits to DebuggerMainWindowPrivate
hjk [Thu, 2 Dec 2010 16:43:14 +0000 (17:43 +0100)]
debugger: move DebuggerMainWindow to debuggermainwindow.{h,cpp}
hjk [Thu, 2 Dec 2010 16:33:39 +0000 (17:33 +0100)]
debugger: merger DebuggerMainWindow and DebuggerUISwitcher
hjk [Thu, 2 Dec 2010 12:50:53 +0000 (13:50 +0100)]
debugger: DebuggerUISwitcher code reorg
hjk [Thu, 2 Dec 2010 12:34:23 +0000 (13:34 +0100)]
debugger: make DebuggerMode derive directly from IMode instead of BaseMode
hjk [Thu, 2 Dec 2010 12:20:06 +0000 (13:20 +0100)]
debugger: move most initialization code to extensionsInitialized()
Roberto Raggi [Thu, 2 Dec 2010 15:30:19 +0000 (16:30 +0100)]
Handle array types and some initial work on implicit conversions.
Christian Kandeler [Thu, 2 Dec 2010 15:50:15 +0000 (16:50 +0100)]
INSTALLS element checking: Add more detail to debug message.
For larger projects, it doesn't make much sense without mentioning
the respective project file.
Friedemann Kleint [Thu, 2 Dec 2010 16:00:49 +0000 (17:00 +0100)]
Compile Linux.
Pawel Polanski [Wed, 1 Dec 2010 16:16:50 +0000 (17:16 +0100)]
Certificate validation added to Symbian's signing process
Reviewed-by: Tobias Hunger
Friedemann Kleint [Thu, 2 Dec 2010 14:16:53 +0000 (15:16 +0100)]
Debugger[CODA/TRK]: Emergency shutdown if gdb crashes.
Kill the debuggee when gdb crashes in stopped state to prevent
the phone from locking up.
Task-number: QTCREATORBUG-3099
Arvid Ephraim Picciani [Thu, 2 Dec 2010 14:18:07 +0000 (15:18 +0100)]
lldb: have a proper Agent tranfering the sourcecode
Christian Kandeler [Thu, 2 Dec 2010 14:14:28 +0000 (15:14 +0100)]
Maemo: Fix "mad info" parsing for Qemu, part 2 of 2.
We now evaluate the "purpose" attribute of the "variable" tag and
the "option" attribute of the "value" tag.
Christian Kandeler [Thu, 2 Dec 2010 11:37:25 +0000 (12:37 +0100)]
Maemo: Fix "mad info" parsing for Qemu, part 1.
We now evaluate the new "service" attribute of the "port" tag.
Friedemann Kleint [Thu, 2 Dec 2010 13:07:53 +0000 (14:07 +0100)]
Debugger: Add infrastructure for loading Symbian .sym files.
Add local symbol files for libraries to gdb along with
section addresses using the command
add-symbol-file <file> <address[es]>.
Whenever TRK reports a module load, check for a matching local
.sym file in a folder pointed to by the
QTC_SYMBIAN_SYMBOLFILE_CACHE environment variable
or the folder of the application executable symbol file (which
should be udeb/urel of EPOC).
Rubber-stamped-by: hjk
Daniel Molkentin [Thu, 2 Dec 2010 12:45:02 +0000 (13:45 +0100)]
Set target architecture for the symbian trk adapter
Enables use of multi-target GDB.
Reviewed-by: hjk
Tobias Hunger [Thu, 2 Dec 2010 12:04:59 +0000 (13:04 +0100)]
Git: Use proper name for patches from codepasters
Task-number: QTCREATORBUG-3207
con [Thu, 2 Dec 2010 11:30:19 +0000 (12:30 +0100)]
Introduce a currentEditorStateChanged signal.
That fires when the current editor fires its changed signal.
Arvid Ephraim Picciani [Thu, 2 Dec 2010 11:33:49 +0000 (12:33 +0100)]
lldb: show disasembly if frame unusable
Arvid Ephraim Picciani [Thu, 2 Dec 2010 11:31:50 +0000 (12:31 +0100)]
lldb: change startup sequence to preload the binary
Pawel Polanski [Wed, 1 Dec 2010 12:30:30 +0000 (13:30 +0100)]
If no Symbian device is connected a Build Issue is generated
Christian Kamm [Thu, 2 Dec 2010 10:12:59 +0000 (11:12 +0100)]
QmlJS: Update qml-builtin-types.xml to include QtM plugins.
con [Thu, 2 Dec 2010 09:53:10 +0000 (10:53 +0100)]
Merge remote branch 'origin/2.1'
Conflicts:
README
doc/qt-html-templates.qdocconf
doc/qtcreator.qdoc
doc/qtcreator.qdocconf
share/qtcreator/qml-type-descriptions/qml-builtin-types.xml
share/qtcreator/templates/wizards/qtcreatorplugin/MyPlugin.pluginspec
src/app/Info.plist.in
src/plugins/bineditor/BinEditor.pluginspec.in
src/plugins/bookmarks/Bookmarks.pluginspec.in
src/plugins/classview/ClassView.pluginspec.in
src/plugins/coreplugin/Core.pluginspec.in
src/plugins/coreplugin/coreconstants.h
src/plugins/cpaster/CodePaster.pluginspec.in
src/plugins/cppeditor/CppEditor.pluginspec.in
src/plugins/cpptools/CppTools.pluginspec.in
src/plugins/cvs/CVS.pluginspec.in
src/plugins/debugger/Debugger.pluginspec
src/plugins/designer/Designer.pluginspec.in
src/plugins/fakevim/FakeVim.pluginspec.in
src/plugins/find/Find.pluginspec.in
src/plugins/genericprojectmanager/GenericProjectManager.pluginspec.in
src/plugins/git/ScmGit.pluginspec.in
src/plugins/glsleditor/GLSLEditor.pluginspec.in
src/plugins/helloworld/HelloWorld.pluginspec.in
src/plugins/help/Help.pluginspec.in
src/plugins/imageviewer/ImageViewer.pluginspec.in
src/plugins/locator/Locator.pluginspec.in
src/plugins/mercurial/Mercurial.pluginspec.in
src/plugins/perforce/Perforce.pluginspec.in
src/plugins/projectexplorer/ProjectExplorer.pluginspec.in
src/plugins/qmldesigner/QmlDesigner.pluginspec.in
src/plugins/qmljseditor/QmlJSEditor.pluginspec.in
src/plugins/qmljsinspector/QmlJSInspector.pluginspec.in
src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec.in
src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec.in
src/plugins/regexp/RegExp.pluginspec.in
src/plugins/resourceeditor/ResourceEditor.pluginspec.in
src/plugins/snippets/Snippets.pluginspec
src/plugins/subversion/Subversion.pluginspec.in
src/plugins/tasklist/TaskList.pluginspec.in
src/plugins/texteditor/TextEditor.pluginspec.in
src/plugins/vcsbase/VCSBase.pluginspec.in
src/plugins/welcome/Welcome.pluginspec.in
Christian Kamm [Wed, 1 Dec 2010 13:33:18 +0000 (14:33 +0100)]
Add dump of QtMobility plugins to default type descriptions.
This will enable comlpetion and validation for projects using the Qt
Mobility plugins even when the qmldump machinery fails.
con [Thu, 2 Dec 2010 09:38:04 +0000 (10:38 +0100)]
Version bump.
con [Wed, 1 Dec 2010 16:20:15 +0000 (17:20 +0100)]
Allow empty editor id with openEditorWithContents.
Tries to figure out the editor type from the title pattern in that case.
Rhys Weatherley [Thu, 2 Dec 2010 03:27:42 +0000 (13:27 +1000)]
Autocomplete standard "qt_" shader var names
Rhys Weatherley [Thu, 2 Dec 2010 02:54:03 +0000 (12:54 +1000)]
Populate keyword list from GLSL language variant
Rhys Weatherley [Thu, 2 Dec 2010 02:28:42 +0000 (12:28 +1000)]
Use correct GLSL language variant in code completer
Rhys Weatherley [Thu, 2 Dec 2010 01:30:46 +0000 (11:30 +1000)]
Shader vars now prefixed with "qt_", not "qgl_".
con [Wed, 1 Dec 2010 13:35:36 +0000 (14:35 +0100)]
Update the filter matches for the settings dialog.
Task-number: QTCREATORBUG-2936
Marco Bubke [Wed, 1 Dec 2010 17:42:34 +0000 (18:42 +0100)]
QmlDesigner.Model: Fix wrong function name
Marco Bubke [Wed, 1 Dec 2010 17:08:24 +0000 (18:08 +0100)]
QmlDesigner.StatesEditor: Show a white rectangle in the states editor
Marco Bubke [Wed, 1 Dec 2010 16:48:14 +0000 (17:48 +0100)]
QmlDesigner.NodeInstances: Use internalId for instanceId
Marco Bubke [Wed, 1 Dec 2010 16:44:16 +0000 (17:44 +0100)]
QmlDesigner.Model: Add internalId to the ModelNode
There are many int to ModelNode hashes in the views. This patch implement a int to ModelNode hash in the model to make them obsolete.
Reviewed-By: Thomas Hartmann
Arvid Ephraim Picciani [Wed, 1 Dec 2010 16:46:11 +0000 (17:46 +0100)]
lldb: fetch source from remote, if not locally valid
Arvid Ephraim Picciani [Wed, 1 Dec 2010 16:02:00 +0000 (17:02 +0100)]
lldb: exit guest on EOF
Kai Koehne [Wed, 1 Dec 2010 16:25:15 +0000 (17:25 +0100)]
QmlDesigner: Fix gcc warnings
Reviewed-by: Thomas Hartmann
Kai Koehne [Wed, 1 Dec 2010 16:06:52 +0000 (17:06 +0100)]
Utils: Compile fix
Fix compilation on gcc.
Thomas Hartmann [Wed, 1 Dec 2010 15:51:32 +0000 (16:51 +0100)]
QmlDesigner.metaInfo: replace old NodeMetaInfo with new implementation
The new implementation is based on the QmlJS::Interpreter
meta info system and gets its info from parsing qml and qmldumper
instead of interogating QDeclarative classes.
So we share this code with the Qml TextEditor and this approach is also
way more flexible. It also work with different Qt versions.
The meta info is now bound to a document/rewriter.
The api has changed slightly.
subComponentManager: cleanup
The SubComponentManager does not have to provide meta info, anymore.
propertyParser: cleanup
Enums were never properly converted. here.
metaInfo: remove old MetaInfo classes
Removing the old MetaInfo classes and code
Thomas Hartmann [Wed, 1 Dec 2010 12:41:55 +0000 (13:41 +0100)]
QmlDesigner.formEditor: API cleanup
isContainer() is not anymore
Thomas Hartmann [Wed, 1 Dec 2010 12:41:09 +0000 (13:41 +0100)]
QmlDesigner.itemLibrary: The item library now also provides small icons
The item library now also provides small icons for the navigator.
Thomas Hartmann [Wed, 1 Dec 2010 12:21:22 +0000 (13:21 +0100)]
QmlDesigner.rewriter: exposing lookupContext and document
We need this for the new AST based meta info system
Thomas Hartmann [Wed, 1 Dec 2010 10:11:37 +0000 (11:11 +0100)]
QmlJSInterpreter: adding public API to ASTObjectValue
Those are needed for the Visual Editor
Reviewed-by: Christian Kamm
Thomas Hartmann [Wed, 1 Dec 2010 10:10:36 +0000 (11:10 +0100)]
QmlJSInterpreter: specifying detailed types for QFont/QVector3D
We should differentiate between int and real
Reviewed-by: Christian Kamm
Kai Koehne [Wed, 1 Dec 2010 15:09:08 +0000 (16:09 +0100)]
Utils: New class to map installed file path to source path
FileInProjectFinder implements an heuristic to find the likely source
file for an aribrary file path, e.g. in the shadow build folder or
on the device. This is useful especially for .qml files, which are
executed at runtime.
Reviewed-by: con
Kai Koehne [Wed, 1 Dec 2010 10:46:49 +0000 (11:46 +0100)]
QmlJSDebugger: Code cleanup
Fix indentation + line length.
Christian Kandeler [Wed, 1 Dec 2010 15:55:42 +0000 (16:55 +0100)]
Mobile wizards: Make options pages target-specific.
Task-number: QTCREATORBUG-2511
Reviewed-by: Alessandro Portale
Christian Kandeler [Wed, 1 Dec 2010 12:54:10 +0000 (13:54 +0100)]
Maemo: Change installation prefix for non-Fremantle systems.
- /usr/local -> /usr
- Technically, this changes the default installation path for all
non-Fremantle UNIX systems.
Friedemann Kleint [Wed, 1 Dec 2010 15:37:34 +0000 (16:37 +0100)]
Debugger: Fix StackFrame.usable for CDB
Arvid Ephraim Picciani [Wed, 1 Dec 2010 15:02:21 +0000 (16:02 +0100)]
lldb: forgot startremoteenginedialog.ui
belongs to
0ab67db58ea2824d03e6f7e10da367ad0ac0b29f
Arvid Ephraim Picciani [Wed, 1 Dec 2010 14:57:13 +0000 (15:57 +0100)]
debugger: Engine decides now if a StackFrame is considered usable
Arvid Ephraim Picciani [Wed, 1 Dec 2010 14:41:08 +0000 (15:41 +0100)]
lldb: introduce dialog to start engine remotely
hjk [Wed, 1 Dec 2010 14:20:46 +0000 (15:20 +0100)]
debugger: switch to an existing engine if a new one fails to start
Task-number: QTCREATORBUG-2912
con [Wed, 1 Dec 2010 14:08:43 +0000 (15:08 +0100)]
Don't switch away from debug mode when jumping to line via locator
Task-number: QTCREATORBUG-3192
hjk [Wed, 1 Dec 2010 13:52:53 +0000 (14:52 +0100)]
debugger: fix QMultiMap dumper
Task-number: QTCREATORBUG-3122
Leandro Melo [Wed, 1 Dec 2010 13:33:20 +0000 (14:33 +0100)]
Fix QML auto completer
Pawel Polanski [Tue, 30 Nov 2010 08:48:03 +0000 (09:48 +0100)]
If no Symbian device is connected the deployment process will be skipped instead of aborting the whole build.
Pawel Polanski [Tue, 30 Nov 2010 13:26:12 +0000 (14:26 +0100)]
Extra certificate extensions have been added to the file selection dialog for SymbianOS
Christian Kandeler [Wed, 1 Dec 2010 12:46:16 +0000 (13:46 +0100)]
Fix compilation.
Move #include directive along with matching code.
Written-by: con
Friedemann Kleint [Wed, 1 Dec 2010 12:43:29 +0000 (13:43 +0100)]
Debugger:[New CDB]: Add casting to SymbolGroupValue for QVariant.
Reorganize simple dumpers to be easily nested, add QVariant
dumper. Introduce enumeration and detection routine for types.
Christian Kandeler [Wed, 1 Dec 2010 12:31:23 +0000 (13:31 +0100)]
Maemo: Call dpkg-buildpackage via mad script.
Task-number: QTCREATORBUG-2708
Reviewed-by: kh1
con [Wed, 1 Dec 2010 12:25:08 +0000 (13:25 +0100)]
Could not replace globally with empty string.
Task-number: QTCREATORBUG-2941
con [Wed, 1 Dec 2010 12:10:08 +0000 (13:10 +0100)]
Handle read only files correctly when saving all modified files
We use the editor manager's way to save modified files now, so the
normal logic for read only files is applied, including the "cancel/save
as/open vcs/make writable" dialog.
Also fixes that it wasn't handled as a "cancel" if the user chooses to
cancel this dialog.
Task-number: QTCREATORBUG-3109
con [Wed, 1 Dec 2010 11:52:17 +0000 (12:52 +0100)]
Only show save as button for files that allow it.
con [Fri, 26 Nov 2010 15:01:34 +0000 (16:01 +0100)]
Move some API around and make some IFile based instead of IEditor.
promptReadOnlyFile: EditorManager-->FileManager
fileFilters: EditorManager-->MimeDataBase
saveFile & saveFileAs --> IFile based
con [Wed, 1 Dec 2010 11:24:13 +0000 (12:24 +0100)]
When using splits e.g. the save action was disabled sometimes.
Reviewed-by: mae
con [Wed, 1 Dec 2010 10:54:53 +0000 (11:54 +0100)]
Delete dead code.
Christian Kamm [Wed, 1 Dec 2010 11:00:01 +0000 (12:00 +0100)]
QmlJS editor: Fix automatic quote insertion.
The new multiline string literals mixed things up.
Task-number: QTCREATORBUG-3244
Reviewed-by: Roberto Raggi
Friedemann Kleint [Wed, 1 Dec 2010 10:57:06 +0000 (11:57 +0100)]
Debugger[New CDB]: Fix profile detection warning.
Introduced by
11c7e15acc4b9078349284137b8ea3e4424a7d08.
Acked-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
hjk [Wed, 1 Dec 2010 10:52:18 +0000 (11:52 +0100)]
debugger: make '0' the 'invalid' BreakpointId value
hjk [Wed, 1 Dec 2010 10:43:48 +0000 (11:43 +0100)]
debugger: re-enable breakpoint updates after library loading
hjk [Wed, 1 Dec 2010 10:27:31 +0000 (11:27 +0100)]
debugger: remove dead code
Christian Kamm [Wed, 1 Dec 2010 10:06:25 +0000 (11:06 +0100)]
Add missing include.
Christian Kamm [Wed, 1 Dec 2010 09:19:53 +0000 (10:19 +0100)]
C++ indenter: Fix labels.
Reviewed-by: Roberto Raggi
hjk [Wed, 1 Dec 2010 09:11:30 +0000 (10:11 +0100)]
debugger: fix gdb 7.2's template argument hickup also for more then one arg
Leandro Melo [Tue, 30 Nov 2010 13:14:33 +0000 (14:14 +0100)]
Editors: Move auto-completion code out of the editor
This is basically a continuation of the commits which
refactor code out of the base text editor. For instance,
36fa1de4c6a15b2c44736b3491679dd6cfbe27ce and
3a684586fabf103b8e09cef31a18ffae1fd9f0c7.
Also removed the doXXXX() forwarding methods.
Rhys Weatherley [Wed, 1 Dec 2010 05:44:50 +0000 (15:44 +1000)]
Show different icons for GLSL variable categories
Attributes, uniforms, varyings, and constants are shown with a
distinguished icon that is different from regular variables.
Rhys Weatherley [Wed, 1 Dec 2010 04:00:30 +0000 (14:00 +1000)]
Better icons for the GLSL code completer
Rhys Weatherley [Wed, 1 Dec 2010 03:19:22 +0000 (13:19 +1000)]
GLSL array type toString() implementation
Rhys Weatherley [Wed, 1 Dec 2010 02:52:57 +0000 (12:52 +1000)]
Fix vec and mat type names in tooltips
Rhys Weatherley [Wed, 1 Dec 2010 02:30:07 +0000 (12:30 +1000)]
Replace the "Qt" GLSL variant with "ES_100"
The Qt variant is almost exactly the same as GLSL/ES,
so there is little point having a separate variant code.
Rhys Weatherley [Wed, 1 Dec 2010 01:52:10 +0000 (11:52 +1000)]
Recognize all keywords during autocompletion
Rhys Weatherley [Wed, 1 Dec 2010 01:49:36 +0000 (11:49 +1000)]
Make GLSL highlighter aware of language variant
Rhys Weatherley [Wed, 1 Dec 2010 00:04:56 +0000 (10:04 +1000)]
Detect GLSL vs GLSL/ES based on mime type
*.vert and *.frag are now for desktop shaders
*.vsh and *.fsh are now for ES shaders
File/New gives the user the choice which to create
Marco Bubke [Tue, 30 Nov 2010 20:32:52 +0000 (21:32 +0100)]
QmlDesigner.NodeInstances: Refactor image send commands
Marco Bubke [Tue, 30 Nov 2010 16:46:57 +0000 (17:46 +0100)]
QmlDesigner.NodeInstances: Add ChildrenChangedCommand
Because the order of the commands can be changed the reparenting was
changed. Now there is a command with the exact order of child items so
it should be much more correct.
Marco Bubke [Mon, 29 Nov 2010 15:36:08 +0000 (16:36 +0100)]
QmlDesigner.Rewriter: Use the QmlJS Parser instead of the QDeclarativeEngine
The QmlJS Parser is checking the source file so we don't need to use the QmlEngine anymore.
Marco Bubke [Thu, 25 Nov 2010 16:38:48 +0000 (17:38 +0100)]
QmlDesigner.NodeInstances: React to removed import
Christian Kandeler [Tue, 30 Nov 2010 17:10:40 +0000 (18:10 +0100)]
Maemo: Only add target deployment for the current toolchain.
Task-number: QTCREATORBUG-3222
Christian Kandeler [Tue, 30 Nov 2010 17:09:45 +0000 (18:09 +0100)]
Maemo: Set Qemu environment once instead of at every start.
Reviewed-by: kh1
Christian Kandeler [Tue, 30 Nov 2010 16:53:08 +0000 (17:53 +0100)]
Maemo: Move .pro file scope generation to a dedicated function.
Christian Kandeler [Tue, 30 Nov 2010 15:42:30 +0000 (16:42 +0100)]
Maemo: Fix Qemu file path once instead of at every start.
Reviewed-by: kh1
hjk [Tue, 30 Nov 2010 16:14:44 +0000 (17:14 +0100)]
debugger: remove unneeded argument from templateArgument()
Roberto Raggi [Tue, 30 Nov 2010 16:21:30 +0000 (17:21 +0100)]
Reactivate the argument hints.