Erik Verbruggen
bedb5d936b
Moved the QScriptHighlighter & friends into the QmlJS library.
2010-01-18 14:12:44 +01:00
Erik Verbruggen
93144e1bf7
Moved the qmljs shared folder into the shared library.
2010-01-18 14:12:44 +01:00
Erik Verbruggen
e86f2e6041
Fixed tests and tools to use the qmljs dll/so.
2010-01-18 14:12:44 +01:00
Erik Verbruggen
205c9b3f9a
Moved the qmljs shared folder into the shared library.
2010-01-18 14:12:44 +01:00
Erik Verbruggen
41c4253301
Fixed uses of QmlDocument.
2010-01-18 13:40:51 +01:00
Erik Verbruggen
41c0df9f62
Removed qDebug statement.
2010-01-18 13:40:50 +01:00
Erik Verbruggen
525633509e
Changed camel-case file names to be lower-case.
2010-01-18 13:40:49 +01:00
con
383ed798dd
Add widget for selecting settings for a specific target.
2010-01-18 13:40:48 +01:00
Erik Verbruggen
0f8126f62d
Changed the QML/JS editor to treat .qs/.js files as JavaScript, and invoke the appropriate parser for it.
...
Reviewed-by: Christian Kamm
2010-01-18 13:40:47 +01:00
Erik Verbruggen
2dfe4f620c
Incorporated change 07373821696a06f228696e794d1e4568e51a1456 from kinetic-declarativeui.
...
Added utility method to parse JavaScript programs.
Reviewed-by: Christian Kamm
2010-01-18 13:40:46 +01:00
Erik Verbruggen
d19418f4d8
Incorporated change 4a1c0db988c87b4b4922e5a2607adadd633d99a1 from kinetic-declarativeui.
...
Added a utility method to get a casted AST root node.
Reviewed-by: Christian Kamm
2010-01-18 13:40:45 +01:00
Friedemann Kleint
a704b974b5
Script engine: Fix locals/QT_NO_CAST_FROM_ASCII
2010-01-18 13:40:44 +01:00
ck
f717f51bac
Maemo: Automatically display sole device configuration.
...
Chances are the user wants to select it anyway.
2010-01-18 13:40:44 +01:00
Tim Jenssen
d496f398db
fixed addNewVersionsFromInstaller, if there is no TimeStamp in GlobalSettings
...
- if there is no LastQtVersionUpdate we doesn't have a real timestamp and we are not able to check against this.
- this will happen during/after installation with qt bundled versions
Reviewed-by: Daniel Molkentin
2010-01-18 13:39:49 +01:00
Roberto Raggi
e790363fda
Check the lookahead character before inserting the matching quote or brace.
2010-01-18 11:24:38 +01:00
Niels Weber
6014969c88
botan build fix needed for ubuntu 7.04
...
This is needed to get botan to build in ubuntu 7.04
Reviewed-by: ck
2010-01-18 10:34:13 +01:00
Erik Verbruggen
88b857d814
Incorporated a73a9b168570d205185b370bcd24b4d0435530e4 from kinetic-declarativeui.
...
Fixed the parser to start with the correct rule when requested to parse JS Source Elements.
2010-01-18 10:09:38 +01:00
Robert Loehning
500ab0f0b4
debugger: Using macro, removed unused QString
2010-01-15 18:24:34 +01:00
con
048275b051
Build fix
2010-01-15 18:19:54 +01:00
Erik Verbruggen
062fa8e783
Added mime-type for JS files to the QMLJS text editor.
2010-01-15 17:41:39 +01:00
Friedemann Kleint
4f95378089
Fix compile.
2010-01-15 17:36:49 +01:00
con
8b5ab50f0e
debugger: remove obsolete add-symbol-file call
...
(cherry picked from commit 4051d8228b
2010-01-15 17:31:31 +01:00
Friedemann Kleint
1855316aaa
Script: Some refactoring.
2010-01-15 17:30:26 +01:00
hjk
81977e2d3d
debugger: combine memory blocks more aggressively
...
(cherry picked from commit 85b39966bc
2010-01-15 17:29:23 +01:00
Erik Verbruggen
96e31c2a0f
Started merging the JS and QML editor plug-ins.
2010-01-15 17:20:19 +01:00
hjk
4051d8228b
debugger: remove obsolete add-symbol-file call
2010-01-15 16:25:52 +01:00
Erik Verbruggen
8cb362ed3a
Added the qmljs.g to OTHER_FILES.
2010-01-15 16:10:33 +01:00
Erik Verbruggen
2fc27769b1
Copied over the new QML grammar & parser from the QtDeclarative module.
...
This covers the following changes in the kinetic-declarativeui
repository:
- e3a49db846fb5c59173256a3b758a2c00a3476b9
- ef6533a54146c7d027f8604aee9e7d4df51b3a90
- cf599d4578205bf2e934ca75042a85f45d4a22f4
- 20dd0ee74d288e0630b5522231e5118153693e0f
2010-01-15 16:06:51 +01:00
hjk
6fc1bfb2c9
debugger: backport some symbian fixes
...
Reviewed-by: Robert Loehning
2010-01-15 16:03:10 +01:00
Martin Aumüller
fb1e56cbe0
fakevim: use FakeVim indentation settings instead of creator's
...
Merge-request: 2160
Reviewed-by: hjk <qtc-committer@nokia.com >
2010-01-15 15:27:42 +01:00
hjk
85b39966bc
debugger: combine memory blocks more aggressively
2010-01-15 15:06:40 +01:00
hjk
b4e99074af
debugger: better positioning of current entry when deleting breakpoints
2010-01-15 15:06:40 +01:00
Erik Verbruggen
389033d038
Merge branch 'master' of scm.dev.nokia.troll.no:creator/mainline
2010-01-15 13:40:24 +01:00
Erik Verbruggen
8e11f81d96
Gotten rid of dulplicate files, and fixed includes.
2010-01-15 13:39:54 +01:00
Robert Loehning
86567e6819
Showing display names of usable build configs if run config doesn't
...
match.
Reviewed-by: con
2010-01-15 13:04:57 +01:00
Roberto Raggi
1c3410d3df
Simplified the handling of QML/JS comments
2010-01-15 12:54:47 +01:00
Roberto Raggi
ed1414a406
Fixed indentation of single line QML/JS comments.
2010-01-15 12:54:46 +01:00
Friedemann Kleint
9ac98a402c
VCS[git]: Add support for stashes.
...
Add non-modal stash management dialog and additional menu option
"Stash snapshot..." to stash away changes prompting for a description,
which will immediately replay the stash (take snapshot and continue
working).
Add interface to IVersionControl for creating/restoring/deleting
snapshots for backup/complex undo operations (currently supported
by git only). Add test options to VCSBasePlugin.
Clean up and extend git client accordingly.
2010-01-15 12:28:22 +01:00
Christian Kamm
cbaa9b9fc0
Add lookup for members of builtin types to QmlLookupContext.
2010-01-15 12:23:33 +01:00
Christian Kamm
a482654bb1
Improve QmlLookupContext::resolve
2010-01-15 12:23:33 +01:00
hjk
1b77161e71
debugger: clean up verbosity settings in trk adapter
2010-01-15 12:07:45 +01:00
Roberto Raggi
7215c212e3
Fixed indentation of QML/JS multi line comments
2010-01-15 11:57:04 +01:00
Tobias Hunger
bc6d14828a
Fix logic of 3061d7dc32.
2010-01-15 11:54:48 +01:00
hjk
ed82a0c3ab
debugger: reinstate 'continue if step fails' fallback in the trk adapter
2010-01-15 11:38:25 +01:00
hjk
08c6899efa
debugger: scrap one of the 6.4 workarounds when using 6.8
2010-01-15 11:38:25 +01:00
hjk
e2e29587a1
debugger: go to a defined state if we can't talk to the inferior anymore
2010-01-15 11:38:24 +01:00
hjk
dd118df7cb
debugger: workaround failing 'info locals' on gdb 6.8-symbianelf
2010-01-15 11:38:20 +01:00
hjk
0cadbd85de
debugger: show the result of failed dumper calls in the log
2010-01-15 11:32:41 +01:00
con
4a46d0864b
Rename IWizard::Kind --> IWizard::WizardKind, add some logic for which wizard kinds to collapse/expand.
2010-01-15 11:07:50 +01:00
con
d4be77b48f
Reorder the "new" wizard categories.
2010-01-15 11:07:50 +01:00
