OSDN Git Service
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.
hjk [Tue, 30 Nov 2010 16:14:44 +0000 (17:14 +0100)]
debugger: replace a few 'template_argument(0)' by the templateArgument wrapper
Makes QSharedPointer & Co. work with gdb 7.2
hjk [Tue, 30 Nov 2010 15:50:42 +0000 (16:50 +0100)]
debugger: work around gdb 7.2 bug
python print gdb.parse_and_eval("ob.d_ptr.d.children\").type.template_argument(0)
creates consistent "RuntimeError: No type named myns::QObject." with stock 7.2
con [Tue, 30 Nov 2010 15:45:04 +0000 (16:45 +0100)]
Merge remote branch 'origin/2.1' into master
Daniel Molkentin [Tue, 30 Nov 2010 12:26:14 +0000 (13:26 +0100)]
Show buttons only when more than one tip is available
Task-number: QTCREATORBUG-3160
Reviewed-by: con
Roberto Raggi [Tue, 30 Nov 2010 15:35:40 +0000 (16:35 +0100)]
Show the argument hints only when the cursor is at the right of an open brace.
Roberto Raggi [Tue, 30 Nov 2010 15:27:46 +0000 (16:27 +0100)]
Don't skip gl_* symbols.
Roberto Raggi [Tue, 30 Nov 2010 15:25:03 +0000 (16:25 +0100)]
Mark the current argument.
Roberto Raggi [Tue, 30 Nov 2010 15:21:36 +0000 (16:21 +0100)]
Process constructors.
Roberto Raggi [Tue, 30 Nov 2010 15:10:07 +0000 (16:10 +0100)]
Process binary expressions.
Roberto Raggi [Tue, 30 Nov 2010 14:47:03 +0000 (15:47 +0100)]
Handle logical xor.
Roberto Raggi [Tue, 30 Nov 2010 14:44:32 +0000 (15:44 +0100)]
Handle the long float suffix.
hjk [Tue, 30 Nov 2010 14:44:29 +0000 (15:44 +0100)]
debugger: show breakpoint markers more often again
Roberto Raggi [Tue, 30 Nov 2010 14:42:18 +0000 (15:42 +0100)]
Show the signatures in a tooltip when completing functions.
Christian Kandeler [Tue, 30 Nov 2010 14:31:15 +0000 (15:31 +0100)]
Maemo: Move "mad info" parsing for Qemu specs into dedicated classes.
Christian Kandeler [Tue, 30 Nov 2010 13:25:21 +0000 (14:25 +0100)]
Maemo: Move MaemoQemuRuntime class to its own file.
Christian Kandeler [Tue, 30 Nov 2010 13:14:55 +0000 (14:14 +0100)]
Maemo: Rename "Runtime" class to make the name more unique.
Friedemann Kleint [Tue, 30 Nov 2010 13:42:04 +0000 (14:42 +0100)]
Debugger[New CDB]: Add infrastructure for casting/adding symbols.
Some more value fixing/support double-quoted commands in extension.
Functionality for printing command help.
hjk [Tue, 30 Nov 2010 12:50:25 +0000 (13:50 +0100)]
debugger: fix QVariant dumper corner case
Christian Kandeler [Tue, 30 Nov 2010 12:45:15 +0000 (13:45 +0100)]
Maemo: Support new "mad info" schema.
Reviewed-by: kh1
hjk [Tue, 30 Nov 2010 12:39:01 +0000 (13:39 +0100)]
debugger: make "threadspec" an int instead of a bytearray
hjk [Tue, 30 Nov 2010 11:49:09 +0000 (12:49 +0100)]
debygger: remove unused code
hjk [Tue, 30 Nov 2010 11:47:53 +0000 (12:47 +0100)]
debugger: less magic state transitions in the break handler
Christian Kamm [Tue, 30 Nov 2010 12:27:19 +0000 (13:27 +0100)]
QmlDump: Fix use with namespaced types.
Reviewed-by: Roberto Raggi
con [Tue, 30 Nov 2010 11:55:41 +0000 (12:55 +0100)]
Window title didn't show nice name for e.g. diff views.
Use the editor's displayName for the window title.
Also there were missing change signal emissions in setDisplayName
implementations.
Moves the actual handling of the window title from Session to
EditorManager (so it now is also done for the hypothetical case of no
project explorer plugin).
Task-number: QTCREATORBUG-3207
con [Tue, 23 Nov 2010 11:47:45 +0000 (12:47 +0100)]
Support symbolic links in the file manager.
We didn't watch the symbolic link itself before, only the final link
target. We are watching the symbolic link and the final link target now.
Ugly hack: We need to work around QTBUG-15522. The inotify and kqueue
based file system watcher engines (Linux + Mac) don't report changes to
symbolic links. The workaround is to use the polling engine *only for
the links themselves*. The only way to force the use of the polling
engine is by using the auto test hook in QFileSystemWatcher.
Christiaan Janssen [Tue, 30 Nov 2010 10:35:17 +0000 (11:35 +0100)]
QmlEngine: handling breakpoint insertions/removals
Reviewed-by: hjk
Christiaan Janssen [Mon, 29 Nov 2010 16:12:43 +0000 (17:12 +0100)]
DebuggerEngine: fix shutdown when run failed
Reviewed-by: hjk
Christian Kamm [Tue, 30 Nov 2010 10:00:23 +0000 (11:00 +0100)]
QmlJS: Don't trigger completion for '/' outside string literals.
Reviewed-by: Roberto Raggi
Christian Kandeler [Tue, 30 Nov 2010 09:55:44 +0000 (10:55 +0100)]
Maemo: Make SSH connection error messages a bit more helpful.
Task-number: QTCREATORBUG-3225
hjk [Tue, 30 Nov 2010 09:03:20 +0000 (10:03 +0100)]
debugger: mark breakpoints as 'insertion proceeding' in qml debugger
hjk [Tue, 30 Nov 2010 09:00:33 +0000 (10:00 +0100)]
debugger: add a few more asserts
hjk [Tue, 30 Nov 2010 07:59:22 +0000 (08:59 +0100)]
debugger: make breakpoint enables state visible in the breakpoint dialog
hjk [Mon, 29 Nov 2010 17:59:30 +0000 (18:59 +0100)]
debugger: cosmetics
Kai Koehne [Tue, 30 Nov 2010 06:48:58 +0000 (07:48 +0100)]
QmlProject: Fix crash for invalid Qt version
Regression introduced by
dcd1876d5ba.
Rhys Weatherley [Mon, 29 Nov 2010 23:08:00 +0000 (09:08 +1000)]
Sort most relevant swizzle orderings to the top
"xyz", "st", and "rgb" are more likely to be what the user
wants than things like "aaar" and "abbb", so sort the
completion list to move common swizzles to the top.
Roberto Raggi [Mon, 29 Nov 2010 21:21:02 +0000 (22:21 +0100)]
Recover from unfinished do-while loops.
kh1 [Mon, 29 Nov 2010 17:35:07 +0000 (18:35 +0100)]
Fix usage of mad command, seems we depend on the system env.
Roberto Raggi [Mon, 29 Nov 2010 17:16:44 +0000 (18:16 +0100)]
Evaluate member accesses.
Roberto Raggi [Mon, 29 Nov 2010 16:21:47 +0000 (17:21 +0100)]
Implemented some basic code completion.
dt [Mon, 29 Nov 2010 16:10:32 +0000 (17:10 +0100)]
Bauhaus: Fix border around zoom actiom
Reviewed-By: Jens Bache-Wiig
Arvid Ephraim Picciani [Mon, 29 Nov 2010 16:02:01 +0000 (17:02 +0100)]
lldb: move away from local sockets to stdio coms
can now pluginto any host via ssh.
define QTC_LLDB_GUEST=/some/script in the env
where script is a wrapper that does ssh, or whatever you need
Arvid Ephraim Picciani [Fri, 26 Nov 2010 15:47:10 +0000 (16:47 +0100)]
lddb: fix tons of missing breaks
hjk [Mon, 29 Nov 2010 15:53:40 +0000 (16:53 +0100)]
Kai Koehne [Mon, 29 Nov 2010 13:16:38 +0000 (14:16 +0100)]
QmlProject: Restrict UI to using the System Environment
There are probably very little use cases where you want to start
from a clean environment, and there is no such thing as a Build
Environment (although we magically add some toolchain settings to
the environment).
Kai Koehne [Mon, 29 Nov 2010 11:50:44 +0000 (12:50 +0100)]
QmlProject: Allow user to change process environment
Task-number: QTCREATORBUG-2600
Kai Koehne [Mon, 29 Nov 2010 10:42:58 +0000 (11:42 +0100)]
QmlProject: Split RunConfiguration, ..Widget into two classes