OSDN Git Service

qt-creator-jp/qt-creator-jp.git
13 years agodebugger: forward-port 49cac3d4484faf9308260d77cb1562c3a756b41e
hjk [Mon, 29 Nov 2010 15:53:40 +0000 (16:53 +0100)]
debugger: forward-port 49cac3d4484faf9308260d77cb1562c3a756b41e

Mis-merge?

13 years agoQmlProject: Restrict UI to using the System Environment
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).

13 years agoQmlProject: Allow user to change process 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

13 years agoQmlProject: Split RunConfiguration, ..Widget into two classes
Kai Koehne [Mon, 29 Nov 2010 10:42:58 +0000 (11:42 +0100)]
QmlProject: Split RunConfiguration, ..Widget into two classes

13 years agoQmlProject: Code cleanup
Kai Koehne [Mon, 29 Nov 2010 08:45:30 +0000 (09:45 +0100)]
QmlProject: Code cleanup

13 years agodebugger: remove "debug debugging helper" option
hjk [Mon, 29 Nov 2010 12:52:43 +0000 (13:52 +0100)]
debugger: remove "debug debugging helper" option

Only useful for the compiled dumpers, and I have not used it for a while.

13 years agodebugger: remove unneeded argument to showToolTip
hjk [Mon, 29 Nov 2010 12:38:02 +0000 (13:38 +0100)]
debugger: remove unneeded argument to showToolTip

13 years agodebugger: remove toying with semitransparent tooltips
hjk [Mon, 29 Nov 2010 12:31:51 +0000 (13:31 +0100)]
debugger: remove toying with semitransparent tooltips

Reviewed-by: Thorbjorn Lindeijer
Task-number: QTCREATORBUG-3072

13 years agodebugger: output a log message for spurious SIGTRAP
hjk [Fri, 26 Nov 2010 13:35:36 +0000 (14:35 +0100)]
debugger: output a log message for spurious SIGTRAP

13 years agoDebugger[new CDB]: Add support for more core types.
Friedemann Kleint [Mon, 29 Nov 2010 11:35:19 +0000 (12:35 +0100)]
Debugger[new CDB]: Add support for more core types.

Structures with accessible members.

13 years agoQmlJS: Don't warn about expression statements in script bindings.
Christian Kamm [Mon, 29 Nov 2010 11:21:02 +0000 (12:21 +0100)]
QmlJS: Don't warn about expression statements in script bindings.

Reviewed-by: Roberto Raggi
13 years agoAdd missing include.
Christian Kamm [Mon, 29 Nov 2010 10:53:51 +0000 (11:53 +0100)]
Add missing include.

13 years agoQmlJS: Don't warn for "string == ''" and "boolean == true".
Christian Kamm [Mon, 29 Nov 2010 10:52:30 +0000 (11:52 +0100)]
QmlJS: Don't warn for "string == ''" and "boolean == true".

Reviewed-by: Roberto Raggi
13 years agoQmlJS: Don't warn on 'numbervalue == 0'.
Christian Kamm [Mon, 29 Nov 2010 10:20:07 +0000 (11:20 +0100)]
QmlJS: Don't warn on 'numbervalue == 0'.

Reviewed-by: Roberto Raggi
13 years agoQmlDesigner.metaInfo: crash fix
Thomas Hartmann [Thu, 25 Nov 2010 08:44:04 +0000 (09:44 +0100)]
QmlDesigner.metaInfo: crash fix

13 years agoQmlDesigner.rewriter: crash fix
Thomas Hartmann [Thu, 25 Nov 2010 08:44:52 +0000 (09:44 +0100)]
QmlDesigner.rewriter: crash fix

These sanity checks are needed

13 years agoQmlDesigner.propertyEditor: speedup loading of QmlDesigner
Thomas Hartmann [Thu, 25 Nov 2010 10:49:29 +0000 (11:49 +0100)]
QmlDesigner.propertyEditor: speedup loading of QmlDesigner

The creation of property pages is now delayed

13 years agoFix syntax highlighting of multiline QMLJS strings
Rhys Weatherley [Mon, 29 Nov 2010 04:00:43 +0000 (14:00 +1000)]
Fix syntax highlighting of multiline QMLJS strings

13 years agoSimple error recovery.
Roberto Raggi [Mon, 29 Nov 2010 08:54:27 +0000 (09:54 +0100)]
Simple error recovery.

Well, it's not very advanced but it is probably good enough for now.

13 years agoQmlJS: Remove overzealous 'undefined' check for enums.
Christian Kamm [Mon, 29 Nov 2010 07:59:54 +0000 (08:59 +0100)]
QmlJS: Remove overzealous 'undefined' check for enums.

The "value might be 'undefined'" warning triggered whenever the static
expression evaluator failed to produce a value. At the moment, it does
so for almost all non-trivial expressions.

The warning is now disabled.

Task-number: QTCREATORBUG-3208

13 years agoRemove type categories from the GLSL AST
Rhys Weatherley [Mon, 29 Nov 2010 03:04:54 +0000 (13:04 +1000)]
Remove type categories from the GLSL AST

Type categories are now handled at semantic analysis time
so we don't need to track them at syntax analysis time.

13 years agoUse the GLSL/ES system library by default.
Rhys Weatherley [Mon, 29 Nov 2010 00:09:22 +0000 (10:09 +1000)]
Use the GLSL/ES system library by default.

13 years agoUpdate GLSL system library definitions
Rhys Weatherley [Sun, 28 Nov 2010 23:30:56 +0000 (09:30 +1000)]
Update GLSL system library definitions

13 years agoGenericBuildConfiguration: Use user modified environment
dt [Sun, 28 Nov 2010 12:14:04 +0000 (13:14 +0100)]
GenericBuildConfiguration: Use user modified environment

Task-Nr: QTCREATORBUG-3211

13 years agoOops, NamedTypeAST should produce a Type and not an ExprResult.
Roberto Raggi [Sat, 27 Nov 2010 22:18:51 +0000 (23:18 +0100)]
Oops, NamedTypeAST should produce a Type and not an ExprResult.

13 years agoMaemo: Get rid of some environment setting redundancies.
Christian Kandeler [Fri, 26 Nov 2010 16:53:13 +0000 (17:53 +0100)]
Maemo: Get rid of some environment setting redundancies.

Reviewed-by: kh1
13 years agoRemove warning about invalid run configurations
Tobias Hunger [Fri, 26 Nov 2010 16:10:25 +0000 (17:10 +0100)]
Remove warning about invalid run configurations

Reviewed-by: dt
13 years agolldb: remove runlock
Arvid Ephraim Picciani [Fri, 26 Nov 2010 15:34:10 +0000 (16:34 +0100)]
lldb: remove runlock

preventing access to functions while inferior is running,
is the job of the gui

13 years agoSymbian: Pass on license file information
Tobias Hunger [Fri, 26 Nov 2010 15:13:54 +0000 (16:13 +0100)]
Symbian: Pass on license file information

Pass on license file information from Qt Creator's environment to the
build environment if that is needed (RVCT compilers).

13 years agolldb: disable gdb emulation by default
Arvid Ephraim Picciani [Fri, 26 Nov 2010 15:03:02 +0000 (16:03 +0100)]
lldb: disable gdb emulation by default

since right now there is no way to differ between
'default true' and 'user true' in creator settings

13 years agoSet up the GLSL variant.
Roberto Raggi [Fri, 26 Nov 2010 14:58:17 +0000 (15:58 +0100)]
Set up the GLSL variant.

13 years agolldb: flush socket after terminator to prevent severe lag
Arvid Ephraim Picciani [Fri, 26 Nov 2010 14:57:00 +0000 (15:57 +0100)]
lldb: flush socket after terminator to prevent severe lag

13 years agoStore the numbers and the identifiers in two different sets.
Roberto Raggi [Fri, 26 Nov 2010 14:50:55 +0000 (15:50 +0100)]
Store the numbers and the identifiers in two different sets.

13 years agoDebugger[New CDDB]: Dump strings and simple Qt types.
Friedemann Kleint [Fri, 26 Nov 2010 14:51:56 +0000 (15:51 +0100)]
Debugger[New CDDB]: Dump strings and simple Qt types.

Add infrastructure for simple dumpers in Symbol group.
Fix display of class values.

13 years agoCompile fix
Tobias Hunger [Fri, 26 Nov 2010 14:36:06 +0000 (15:36 +0100)]
Compile fix

13 years agoCompile fix
Tobias Hunger [Fri, 26 Nov 2010 14:23:25 +0000 (15:23 +0100)]
Compile fix

13 years agoDetect the type of the shader.
Roberto Raggi [Fri, 26 Nov 2010 14:14:33 +0000 (15:14 +0100)]
Detect the type of the shader.

13 years agoInitialize the shaders
Roberto Raggi [Fri, 26 Nov 2010 14:00:46 +0000 (15:00 +0100)]
Initialize the shaders

13 years agolldb: enable lldb through gui configure page
Arvid Ephraim Picciani [Fri, 26 Nov 2010 14:10:10 +0000 (15:10 +0100)]
lldb: enable lldb through gui configure page

13 years agoSymbian: Introduce RVCT 4 toolchain
Tobias Hunger [Fri, 26 Nov 2010 11:17:14 +0000 (12:17 +0100)]
Symbian: Introduce RVCT 4 toolchain

Task-number: 2481

13 years agoToolChain: Rename RVCT toolchains to RVCT2
Tobias Hunger [Fri, 26 Nov 2010 10:54:38 +0000 (11:54 +0100)]
ToolChain: Rename RVCT toolchains to RVCT2

Reviewed-by: dt
13 years agolldb: detect lldb build in environment WITH_LLDB
Arvid Ephraim Picciani [Fri, 26 Nov 2010 13:40:45 +0000 (14:40 +0100)]
lldb: detect lldb build in environment WITH_LLDB

13 years agoMaemo: Fix recursive directory removal.
Christian Kandeler [Fri, 26 Nov 2010 13:41:04 +0000 (14:41 +0100)]
Maemo: Fix recursive directory removal.

It's not an error if the directory does not exist.

13 years agodebugger: fix state after error output to -exec-interrupt
hjk [Fri, 26 Nov 2010 13:23:52 +0000 (14:23 +0100)]
debugger: fix state after error output to -exec-interrupt

Task-number: QTCREATORBUG-2850

13 years agodebugger: cosmetics
hjk [Fri, 26 Nov 2010 11:58:04 +0000 (12:58 +0100)]
debugger: cosmetics

13 years agoQmlJS: Allow QML plugins to ship pre-dumped type descriptions.
Christian Kamm [Fri, 26 Nov 2010 13:24:59 +0000 (14:24 +0100)]
QmlJS: Allow QML plugins to ship pre-dumped type descriptions.

If there's a library.xml file next to the qmldir file, Creator will
read that instead of trying to run qmldump on the library.

Reviewed-by: Erik Verbruggen
13 years agoReport only one error message for line (well, at least for now).
Roberto Raggi [Fri, 26 Nov 2010 13:25:24 +0000 (14:25 +0100)]
Report only one error message for line (well, at least for now).

13 years agoAdded Engine::blockDiagnosticMessages()
Roberto Raggi [Fri, 26 Nov 2010 13:24:03 +0000 (14:24 +0100)]
Added Engine::blockDiagnosticMessages()

13 years agoLoad the shader intializers.
Roberto Raggi [Fri, 26 Nov 2010 13:18:50 +0000 (14:18 +0100)]
Load the shader intializers.

13 years agoAdded declarations for the GLSL builtins.
Roberto Raggi [Fri, 26 Nov 2010 13:03:05 +0000 (14:03 +0100)]
Added declarations for the GLSL builtins.

13 years agoBuild fix for tools
Thomas Hartmann [Fri, 26 Nov 2010 13:24:44 +0000 (14:24 +0100)]
Build fix for tools

We have to check for Qt Versions and private headers to build qmlpuppet.

Reviewed-by: Kai Koehne
13 years agofixing warnings
Thomas Hartmann [Mon, 27 Sep 2010 12:57:22 +0000 (14:57 +0200)]
fixing warnings

13 years agoSymbian: Use clean pathes when setting up PATH
Tobias Hunger [Fri, 26 Nov 2010 11:20:44 +0000 (12:20 +0100)]
Symbian: Use clean pathes when setting up PATH

13 years agoSymbian: Make sure to call make.exe on windows
Tobias Hunger [Fri, 26 Nov 2010 11:19:32 +0000 (12:19 +0100)]
Symbian: Make sure to call make.exe on windows

In some situations the build system will try to run make.pl otherwise!

13 years agoGit: Add some tooltips
Tobias Hunger [Fri, 26 Nov 2010 10:36:06 +0000 (11:36 +0100)]
Git: Add some tooltips

Add tooltips to the toggles found in the Git Blame and Diff editors.

13 years agoDebugger: Fix compilation, centralize breakpoint type detection.
Friedemann Kleint [Fri, 26 Nov 2010 12:06:03 +0000 (13:06 +0100)]
Debugger: Fix compilation, centralize breakpoint type detection.

Reviewed-by: hjk
13 years agoRun the semantic checker and check for invalid function calls.
Roberto Raggi [Fri, 26 Nov 2010 11:55:24 +0000 (12:55 +0100)]
Run the semantic checker and check for invalid function calls.

13 years agoPropagate the ExprResult::isConstant attribute.
Roberto Raggi [Fri, 26 Nov 2010 11:37:05 +0000 (12:37 +0100)]
Propagate the ExprResult::isConstant attribute.

13 years agoCompute the types of literal expressions.
Roberto Raggi [Fri, 26 Nov 2010 11:35:02 +0000 (12:35 +0100)]
Compute the types of literal expressions.

13 years agoCheck for undefined symbols.
Roberto Raggi [Fri, 26 Nov 2010 11:30:12 +0000 (12:30 +0100)]
Check for undefined symbols.

13 years agoCreate symbols for variable declarations.
Roberto Raggi [Fri, 26 Nov 2010 11:24:32 +0000 (12:24 +0100)]
Create symbols for variable declarations.

13 years agoCheck for undefined types.
Roberto Raggi [Fri, 26 Nov 2010 11:20:53 +0000 (12:20 +0100)]
Check for undefined types.

13 years agodebugger: watchpoint cosmetics
hjk [Fri, 26 Nov 2010 11:30:05 +0000 (12:30 +0100)]
debugger: watchpoint cosmetics

13 years agoMaemo: Fix code redundancy.
Christian Kandeler [Fri, 26 Nov 2010 11:19:32 +0000 (12:19 +0100)]
Maemo: Fix code redundancy.

Recursively removing a directory was implmented twice.

13 years agoEvaluate the expression's attributes.
Roberto Raggi [Fri, 26 Nov 2010 11:08:43 +0000 (12:08 +0100)]
Evaluate the expression's attributes.

13 years agoAdded GLSL::OverloadSet.
Roberto Raggi [Fri, 26 Nov 2010 10:33:49 +0000 (11:33 +0100)]
Added GLSL::OverloadSet.

13 years agodebugger: compile fix
hjk [Fri, 26 Nov 2010 10:51:12 +0000 (11:51 +0100)]
debugger: compile fix

13 years agodebugger: link fix
hjk [Fri, 26 Nov 2010 10:42:24 +0000 (11:42 +0100)]
debugger: link fix

13 years agodebugger: code cosmetics
hjk [Fri, 26 Nov 2010 10:38:16 +0000 (11:38 +0100)]
debugger: code cosmetics

13 years agodebugger: remove unneeded declarations
hjk [Fri, 26 Nov 2010 10:10:03 +0000 (11:10 +0100)]
debugger: remove unneeded declarations

13 years agodebugger: code cosmetics
hjk [Fri, 26 Nov 2010 09:10:00 +0000 (10:10 +0100)]
debugger: code cosmetics

13 years agodebugger: make DebuggerEngine::acceptsBreakpoint(id) pure
hjk [Fri, 26 Nov 2010 09:20:50 +0000 (10:20 +0100)]
debugger: make DebuggerEngine::acceptsBreakpoint(id) pure

13 years agodebugger: polish module symbols
hjk [Fri, 26 Nov 2010 08:58:34 +0000 (09:58 +0100)]
debugger: polish module symbols

13 years agodebugger: remove needless indirection
hjk [Thu, 25 Nov 2010 17:49:26 +0000 (18:49 +0100)]
debugger: remove needless indirection

13 years agoShow tooltips with the error messages.
Roberto Raggi [Fri, 26 Nov 2010 10:17:30 +0000 (11:17 +0100)]
Show tooltips with the error messages.

13 years agoMade the completion less annoying.
Roberto Raggi [Fri, 26 Nov 2010 10:09:32 +0000 (11:09 +0100)]
Made the completion less annoying.

Don't trigger again the completion when completing identifiers.

13 years agoAdded indenter, code folding and automagically brace insertion to the GLSL editor.
Roberto Raggi [Fri, 26 Nov 2010 09:59:33 +0000 (10:59 +0100)]
Added indenter, code folding and automagically brace insertion to the GLSL editor.

13 years agoMaemo: Whitespace fixes.
Christian Kandeler [Fri, 26 Nov 2010 09:41:39 +0000 (10:41 +0100)]
Maemo: Whitespace fixes.

13 years agoMaemo: Fix Harmattan icon workaround.
Christian Kandeler [Fri, 26 Nov 2010 09:37:32 +0000 (10:37 +0100)]
Maemo: Fix Harmattan icon workaround.

Don't hardcode PNG format.

13 years agoMaemo: Small deployment refactoring.
Christian Kandeler [Fri, 26 Nov 2010 08:56:05 +0000 (09:56 +0100)]
Maemo: Small deployment refactoring.

13 years agoMaemo: For deployment, use our models directly.
Christian Kandeler [Fri, 26 Nov 2010 08:45:10 +0000 (09:45 +0100)]
Maemo: For deployment, use our models directly.

Don't waste time going through the Qt4ProFileNodes.

13 years agoAdd GLSL sampler types to semantic analysis phase
Rhys Weatherley [Fri, 26 Nov 2010 03:51:45 +0000 (13:51 +1000)]
Add GLSL sampler types to semantic analysis phase

13 years agoAdd support for GLSL array and index types.
Rhys Weatherley [Fri, 26 Nov 2010 01:06:24 +0000 (11:06 +1000)]
Add support for GLSL array and index types.

Index types are arrays, matrices, and vectors, which can
all be "indexed" by operator[].

13 years agoPopulate GLSL vecN types with swizzled field names
Rhys Weatherley [Fri, 26 Nov 2010 00:11:54 +0000 (10:11 +1000)]
Populate GLSL vecN types with swizzled field names

13 years agoFix AST for GLSL DeclarationStatement
Rhys Weatherley [Fri, 26 Nov 2010 00:06:05 +0000 (10:06 +1000)]
Fix AST for GLSL DeclarationStatement

DeclarationStatement wraps a single declaration, not a list.

13 years agodebugger: save a few cycles when updating a large locals view
hjk [Thu, 25 Nov 2010 17:44:07 +0000 (18:44 +0100)]
debugger: save a few cycles when updating a large locals view

13 years agoMaemo: Allow adding an application launcher icon via the GUI.
Christian Kandeler [Thu, 25 Nov 2010 16:58:02 +0000 (17:58 +0100)]
Maemo: Allow adding an application launcher icon via the GUI.

Reviewed-by: kh1
13 years agoMerge branch 'master' of scm.dev.nokia.troll.no:creator/mainline
con [Thu, 25 Nov 2010 16:51:10 +0000 (17:51 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:creator/mainline

13 years agoMerge remote branch 'origin/2.1'
con [Thu, 25 Nov 2010 16:51:01 +0000 (17:51 +0100)]
Merge remote branch 'origin/2.1'

Conflicts:
src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp

13 years agoFix debugging Symbian gcce raptor built apps.
con [Thu, 25 Nov 2010 16:47:56 +0000 (17:47 +0100)]
Fix debugging Symbian gcce raptor built apps.

Local executable is put into a different folder
(always 'armv5' despite it being a 'gcce' build, changed in qmake),
and the symbol file is named 'foo.exe.sym' instead of 'foo.sym'.

Done-by: Friedemann Kleint
Reviewed-by: Pawel Polanski
13 years agoMerge commit 'bd8b23d4bad4191367e7c5eb3297769a2477afec' (origin/2.1)
con [Thu, 25 Nov 2010 16:36:50 +0000 (17:36 +0100)]
Merge commit 'bd8b23d4bad4191367e7c5eb3297769a2477afec' (origin/2.1)

Conflicts:
src/plugins/debugger/qml/qmlengine.cpp

13 years agoRunControl actions updated when project settings change
Christiaan Janssen [Thu, 25 Nov 2010 16:30:58 +0000 (17:30 +0100)]
RunControl actions updated when project settings change

Reviewed-by: Kai Koehne
13 years agodebugger: allow re-running debugger engines
hjk [Thu, 25 Nov 2010 16:16:58 +0000 (17:16 +0100)]
debugger: allow re-running debugger engines

Task-number: QTCREATORBUG-3073

13 years agomake breakpoint and watchers view more robust when switching sessions
hjk [Thu, 25 Nov 2010 15:32:07 +0000 (16:32 +0100)]
make breakpoint and watchers view more robust when switching sessions

13 years agodebugger: more manual test clarification.
hjk [Thu, 25 Nov 2010 14:16:04 +0000 (15:16 +0100)]
debugger: more manual test clarification.

13 years agoDebugger[New CDB]: Add SymbolGroupValue for simple dumping.
Friedemann Kleint [Thu, 25 Nov 2010 16:17:06 +0000 (17:17 +0100)]
Debugger[New CDB]: Add SymbolGroupValue for simple dumping.

13 years agoRemove some unused / useless api.
con [Thu, 18 Nov 2010 17:11:15 +0000 (18:11 +0100)]
Remove some unused / useless api.

13 years agoFix debugging Symbian gcce raptor built apps.
con [Thu, 25 Nov 2010 14:54:21 +0000 (15:54 +0100)]
Fix debugging Symbian gcce raptor built apps.

Local executable is put into a different folder
(always 'armv5' despite it being a 'gcce' build, changed in qmake),
and the symbol file is named 'foo.exe.sym' instead of 'foo.sym'.

Done-by: Friedemann Kleint
Reviewed-by: Pawel Polanski
13 years agoExport QmlJSEditorEditable.
Christian Kamm [Thu, 25 Nov 2010 14:10:25 +0000 (15:10 +0100)]
Export QmlJSEditorEditable.

Rubber-stamped-by: Friedemann Kleint
13 years agodebugger: add notes that std::container dumpers are python-only
hjk [Thu, 25 Nov 2010 14:08:18 +0000 (15:08 +0100)]
debugger: add notes that std::container dumpers are python-only