OSDN Git Service
Kai Koehne [Tue, 23 Nov 2010 09:51:02 +0000 (10:51 +0100)]
QmlJsDebugger: Code cleanup
Kai Koehne [Tue, 23 Nov 2010 09:31:12 +0000 (10:31 +0100)]
QmlJsInspector: Code cleanup
Kai Koehne [Tue, 23 Nov 2010 08:23:19 +0000 (09:23 +0100)]
QmlJSInspector: Code cleanup
Kai Koehne [Mon, 22 Nov 2010 15:16:55 +0000 (16:16 +0100)]
QmlJSDebugger: Fix indentation in .pri file
Kai Koehne [Mon, 22 Nov 2010 15:15:08 +0000 (16:15 +0100)]
QmlJsDebugger: Remove QWEAKPOINTER_ENABLE_ARROW define
Any DEFINE used in qmljsdebugger-lib.pri is also passed to the users
code.
Kai Koehne [Mon, 22 Nov 2010 15:11:06 +0000 (16:11 +0100)]
QmlJSDebugger: Remove editor.pri
Incorporate into qmljsdebugger-lib.pri
Task-number: QTCREATORBUG-2951
Christiaan Janssen [Tue, 23 Nov 2010 15:12:16 +0000 (16:12 +0100)]
QmlDebugger: Assigning Qml breakpoints to the Qml Engine
Reviewed-by: hjk
Tobias Hunger [Tue, 23 Nov 2010 15:00:33 +0000 (16:00 +0100)]
Git: Only enable submit button when a description is available
Only enable submit button in the git submit editor when a non-empty
desciption of the patch is available. Git rejects empty commit messages
and old versions fail without even giving an error Qt Creator can detect,
so this should make commiting a bit more save.
Task-number: QTCREATORBUG-2410
Tobias Hunger [Tue, 23 Nov 2010 13:40:52 +0000 (14:40 +0100)]
Git: Do not accept invalid commits
Do not offer to commit in the dialog opened when closing the
commit editor when the commit is not containing all the required
information.
Oswald Buddenhagen [Tue, 23 Nov 2010 14:44:45 +0000 (15:44 +0100)]
Merge remote branch 'origin/2.1'
dt [Tue, 23 Nov 2010 14:19:20 +0000 (15:19 +0100)]
New Project Wizard: Recheck existence of directory after browsing
The user might create directories or delete them while in the browsing
interface, thus in the PathChooser trigger a validation after browsing.
Task-Nr: QTCREATORBUG-3105
Reviewed-By: Friedemann Kleint
hjk [Tue, 23 Nov 2010 12:44:37 +0000 (13:44 +0100)]
debugger: make watchers visible after project load again
hjk [Tue, 23 Nov 2010 12:28:18 +0000 (13:28 +0100)]
debugger: make freshly inserted watchers immediately visble
Even if no engine is running.
Friedemann Kleint [Tue, 23 Nov 2010 12:36:39 +0000 (13:36 +0100)]
Debugger[new CDB]: Work on locals.
Add optional code model scope checking. Remove need to call
to 'expandlocals' command by giving 'locals' options for expanded
and uninitialized variables, saving one roundtrip.
Handle shadowed variables and __formal parameters. Differentiate
between name and iname in SymbolGroup.
Tobias Hunger [Tue, 23 Nov 2010 12:06:55 +0000 (13:06 +0100)]
Symbian: Improve warnings on project setup
* Warn on spaces in the project path
* Warn on special characters in the project name only
This should stop warnings from appearing when trying to run the Qt demos
on symbian.
Tobias Hunger [Tue, 23 Nov 2010 11:17:54 +0000 (12:17 +0100)]
Fix default names of configutation objects
Fix default names of project configuration objects on upgrades
from pre 2.0 creators.
Task-number: QTCREATORBUG-3143
hjk [Tue, 23 Nov 2010 11:37:44 +0000 (12:37 +0100)]
debugger: move the "SOMETHING NEEDED" message from console to log
hjk [Tue, 23 Nov 2010 11:31:47 +0000 (12:31 +0100)]
debugger: make attach to running process stop the process (again)
Thomas Hartmann [Tue, 23 Nov 2010 11:14:48 +0000 (12:14 +0100)]
QmlDesigner.rewriter: crash fix for Flipable
Removing a property from a Flipabke back or front property
resulted in a crash, because the offset of UiObjectBinding
was not handled correctly.
The left hand side of the binding is not part of the node anymore.
Reviewed-by: Kai Koehne
Rhys Weatherley [Tue, 23 Nov 2010 07:14:19 +0000 (17:14 +1000)]
Add .vert to the set of recognized GLSL extensions
Rhys Weatherley [Tue, 23 Nov 2010 07:05:55 +0000 (17:05 +1000)]
Highlight reserved GLSL keywords
Daniel Molkentin [Thu, 18 Nov 2010 19:29:40 +0000 (20:29 +0100)]
Add some more examples if available (SDK case)
Reviewed-by: Alessandro Portale
Tobias Hunger [Mon, 22 Nov 2010 17:05:49 +0000 (18:05 +0100)]
Git: Allow . in checkout pathes
Task-number: QTCREATORBUG-3141
hjk [Mon, 22 Nov 2010 16:12:02 +0000 (17:12 +0100)]
debugger: fix display of locals after
fedd048f
hjk [Mon, 22 Nov 2010 15:27:15 +0000 (16:27 +0100)]
debugger: split an assert
Always nice to know which part failed.
Friedemann Kleint [Mon, 22 Nov 2010 16:06:08 +0000 (17:06 +0100)]
Debugger: Remove 'friend gdbengine' from stackhandler.
Preparing the introduction of tooltips for the new
CDB engine. Fix some breakpoint states in CDB.
Thorbjørn Lindeijer [Mon, 22 Nov 2010 09:20:15 +0000 (10:20 +0100)]
Fixed visible wrap column on systems with non-fractional fonts sizes
QFontMetricsF::averageCharWidth seems to always return a fractional size
(at least on Linux/GNOME with DejaVu Mono), even when the font is not
actually drawn at sub-pixels. This caused the visible wrap column to
appear in the wrong place.
As a workaround, use the width of the character 'x', which is pretty
average and does align to pixels when needed.
Task-number: QTCREATORBUG-2746
Reviewed-by: con
Arvid Ephraim Picciani [Mon, 22 Nov 2010 15:23:05 +0000 (16:23 +0100)]
lldb: fix shadow build
Tobias Hunger [Mon, 22 Nov 2010 14:38:21 +0000 (15:38 +0100)]
Symbian: Unset SBS_HOME when not needed
Unset SBS_HOME when none is needed. This prevents SBS from getting
confused about where its dependencies are located.
Task-number: QTCREATORBUG-3145
Reviewed-by: Alessandro Portale
Kai Koehne [Mon, 22 Nov 2010 13:57:14 +0000 (14:57 +0100)]
QmlProject: Fix creator becoming unresponsive if filesystem changes
Buffer update calls to the project tree. Otherwise large updates (e.g.
renaming a directory) will block QtCreator for up to several minutes.
Reviewed-by: ckamm
Friedemann Kleint [Mon, 22 Nov 2010 13:53:20 +0000 (14:53 +0100)]
VCS: Allow to run commands synchronously
Run some commands synchronously. This avoids issues with the UI
reacting to file changes done by the VCS on windows which can lead
to crashes.
Task-number: QTCREATORBUG-3021
Reviewed-by: Tobias Hunger
Tobias Hunger [Mon, 22 Nov 2010 12:36:47 +0000 (13:36 +0100)]
Fix whitespace issue
Arvid Ephraim Picciani [Mon, 22 Nov 2010 13:56:49 +0000 (14:56 +0100)]
Import lldb guest engine code
Friedemann Kleint [Mon, 22 Nov 2010 14:08:15 +0000 (15:08 +0100)]
Code model: Fix endless loop in AbstractEditorSupport::functionAt
used by CDB debugger tooltip (introduced by
A
354b9712e4655040930a9f18de4e6b4c71dc42d9).
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Rubber-stamped-by: dt
dt [Mon, 22 Nov 2010 14:10:20 +0000 (15:10 +0100)]
Qt4ProjectManager: Show ICON in other files
dt [Mon, 22 Nov 2010 12:43:21 +0000 (13:43 +0100)]
Qt4ProjectManager: Do not enumerate files from cumulatively found folders
Ignore folders from cumulative parse, we are recursively enumerating all the
files from those folders and add watchers for them, that's too dangerous
if we get the foldrs wrong and enumerate the whole project tree multiple
times.
Task-Nr: QTCREATORBUG-3104
Reviewed-By: con
Reviewed-By: Alessandro Portale
hjk [Mon, 22 Nov 2010 13:12:53 +0000 (14:12 +0100)]
debugger: make -stack-select-frame and -thread-list-ids discardable
hjk [Mon, 22 Nov 2010 09:20:31 +0000 (10:20 +0100)]
debugger: move qml engine private classes to internal namespace
Friedemann Kleint [Mon, 22 Nov 2010 12:50:40 +0000 (13:50 +0100)]
Debugger[New CDB]: Fix disassembly.
Introduce GDBMI-based 'stack' extension command instead of the
builtin 'k' as this does not print the correct instruction pointer.
Pawel Polanski [Mon, 22 Nov 2010 11:44:59 +0000 (12:44 +0100)]
If no Symbian device is connected to USB port an appropriate message is shown.
Task-Number: QTCREATORBUG-3157
Reviewed-by: Tobias Hunger
Kai Koehne [Fri, 19 Nov 2010 15:03:12 +0000 (16:03 +0100)]
Bauhaus: Remove invalid image file
Requested-by: Maurice Kalinowski
Arvid Ephraim Picciani [Mon, 22 Nov 2010 12:09:01 +0000 (13:09 +0100)]
Adapt IpcEngine to breakpoint handling changes
Friedemann Kleint [Mon, 22 Nov 2010 11:21:56 +0000 (12:21 +0100)]
Debugger: Fix switching between assembler and source.
Do not drop stack index in resetLocation (which is called
when switching). Do not switch to source unless we have
the file.
Reviewed-by: hjk
Tobias Hunger [Mon, 22 Nov 2010 09:46:55 +0000 (10:46 +0100)]
Add some comments about code folding
I needed to find out how this works the hard way, so add
at least some hints on how to work with code folding:-)
Tobias Hunger [Sun, 21 Nov 2010 09:15:12 +0000 (10:15 +0100)]
VCS: Handle code folding in diff view
Allow to do codefolding on files and hunks in the diff editor
Tobias Hunger [Thu, 18 Nov 2010 15:58:30 +0000 (16:58 +0100)]
Git: Add options to diff editor
Pawel Polanski [Mon, 22 Nov 2010 09:47:39 +0000 (10:47 +0100)]
Fixed USB detach related bug on Symbian
Task-Number: QTCREATORBUG-3100
Reviewed-by: Tobias Hunger
Pawel Polanski [Mon, 22 Nov 2010 08:29:48 +0000 (09:29 +0100)]
Password dialog for symbian cert has been polished
Reviewed-by: Tobias Hunger
Alessandro Portale [Mon, 22 Nov 2010 10:06:45 +0000 (11:06 +0100)]
Do not link against (the possibly absent) eiksrv.dso
The template .pri file of the "Qt Quick Application" and
"Qt Mobile Application" wizards linked against eiksrv
when locking the screen orientation. That is however not
necessary.
The real problem is that eiksrv does not get shipped with
the Symbian^1 SDK in Nokia Qt SDK 1.0/1.1. Therefore, the
innecessary link attempt even fails.
This patch removes the -leiksrv and bumps the version for
the template.
Cherrypicking into qtcreator/2.1 is highly recommended.
Task-Number: QTCREATORBUG-3142
Task-Number: QTSDK-194
Christian Kamm [Fri, 19 Nov 2010 17:02:14 +0000 (18:02 +0100)]
C++ indenter: Align to next token instead of end of current.
Task-number: QTCREATORBUG-3136
Reviewed-by: Erik Verbruggen
Alessandro Portale [Fri, 19 Nov 2010 20:11:33 +0000 (21:11 +0100)]
Do not link against (the possibly absent) eiksrv.dso
The template .pri file of the "Qt Quick Application" and
"Qt Mobile Application" wizards linked against eiksrv
when locking the screen orientation. That is however not
necessary.
The real problem is that eiksrv does not get shipped with
the Symbian^1 SDK in Nokia Qt SDK 1.0/1.1. Therefore, the
innecessary link attempt even fails.
This patch removes the -leiksrv and bumps the version for
the template.
Cherrypicking into qtcreator/2.1 is highly recommended.
Task-Number: QTCREATORBUG-3142
Task-Number: QTSDK-194
Leena Miettinen [Fri, 19 Nov 2010 15:23:36 +0000 (16:23 +0100)]
Doc: modify text because Qt SDK contents have changed
Reviewed-by: Oswald Buddenhagen
Leena Miettinen [Fri, 19 Nov 2010 15:23:09 +0000 (16:23 +0100)]
Doc: fix a link to Qt 4.7
Reviewed-by: Oswald Buddenhagen
Leena Miettinen [Fri, 19 Nov 2010 15:22:14 +0000 (16:22 +0100)]
Doc: replace Qt SDK product name with a macro
Reviewed-by: Oswald Buddenhagen
Roberto Raggi [Fri, 19 Nov 2010 15:19:36 +0000 (16:19 +0100)]
Added support for automatic completion.
Friedemann Kleint [Fri, 19 Nov 2010 15:13:22 +0000 (16:13 +0100)]
Debugger[new CDB]: Polish options, add remote debugging.
Kai Koehne [Fri, 19 Nov 2010 14:52:11 +0000 (15:52 +0100)]
Revert "make compile against 4.7 mainline"
This reverts commit
110c58d09eaa9eba81d2c30b0b7c3e438d19b2ef,
and enables qmljs debugging again.
Roberto Raggi [Fri, 19 Nov 2010 14:15:12 +0000 (15:15 +0100)]
Add the identifiers to the completion box.
Well, this is just a temporary hack :)
hjk [Fri, 19 Nov 2010 14:11:19 +0000 (15:11 +0100)]
debugger: even more hacks to display QVariant with custom type and template
hjk [Fri, 19 Nov 2010 14:01:03 +0000 (15:01 +0100)]
debugger: make gdbmacros.py more generic
Mostly move parts of the gdb related quoting to dumper.py, also split
function calls in strings into separate arguments.
hjk [Fri, 19 Nov 2010 12:02:34 +0000 (13:02 +0100)]
debugger: improve python dumper profiling support
Roberto Raggi [Fri, 19 Nov 2010 13:59:33 +0000 (14:59 +0100)]
Report the syntax errors.
Roberto Raggi [Fri, 19 Nov 2010 13:42:55 +0000 (14:42 +0100)]
Introduced GLSL::DiagnosticMessage.
Roberto Raggi [Fri, 19 Nov 2010 13:35:53 +0000 (14:35 +0100)]
Compile.
Roberto Raggi [Fri, 19 Nov 2010 12:01:39 +0000 (13:01 +0100)]
Introduced a simple AST dumper for GLSL.
hjk [Fri, 19 Nov 2010 10:48:52 +0000 (11:48 +0100)]
debugger: adjust format of item count after
f9eea7e1
hjk [Fri, 19 Nov 2010 10:04:36 +0000 (11:04 +0100)]
debugger: make more python dumpers more robust when debug info is missing
Erik Verbruggen [Thu, 18 Nov 2010 16:39:16 +0000 (17:39 +0100)]
C++: implemented switch decl to def for operators
Task-number: QTCREATORBUG-2313
Reviewed-by: Roberto Raggi
hjk [Fri, 19 Nov 2010 08:39:50 +0000 (09:39 +0100)]
debugger: fix thread name display in threads combobox
hjk [Fri, 19 Nov 2010 08:14:08 +0000 (09:14 +0100)]
debugger: improve stepping performance in "instructionwise" mode.
Formatting of disassembler view took too much time.
hjk [Fri, 19 Nov 2010 07:55:01 +0000 (08:55 +0100)]
debugger: remove unused variable in GdbEngine
hjk [Fri, 19 Nov 2010 07:50:53 +0000 (08:50 +0100)]
debugger: remove "quick shot" on stop.
This was used to enhance the user experience in the gdb/MI (non-python)
days as the location marker was shown faster. This does not seem to
make much of a difference anymore. Removal also avoids the "show disassembly
first, source next" flicker.
hjk [Fri, 19 Nov 2010 07:37:43 +0000 (08:37 +0100)]
debugger: fix QRegion dumper for builds without debug info
Oswald Buddenhagen [Thu, 18 Nov 2010 18:33:40 +0000 (19:33 +0100)]
fix ts targets under windows
hjk [Thu, 18 Nov 2010 19:44:36 +0000 (20:44 +0100)]
debugger: better handling of dynamic arrays
dt [Thu, 18 Nov 2010 18:28:23 +0000 (19:28 +0100)]
Merge remote branch 'origin/2.1'
Conflicts:
share/qtcreator/static.pro
src/plugins/qmljseditor/qmljshoverhandler.cpp
src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp
hjk [Thu, 18 Nov 2010 18:15:39 +0000 (19:15 +0100)]
debugger: show len/ptr pair encoded strings for sources ending in .d
Leandro Melo [Thu, 18 Nov 2010 17:49:21 +0000 (18:49 +0100)]
Generic highlighter: Add some Kate LGPL files
Reviewed-by: con
dt [Thu, 18 Nov 2010 17:18:54 +0000 (18:18 +0100)]
FlatModel: forgotten change + compile on windows
hjk [Thu, 18 Nov 2010 16:53:42 +0000 (17:53 +0100)]
debugger: remove macro from breakhandler/h
hjk [Thu, 18 Nov 2010 16:44:04 +0000 (17:44 +0100)]
debugger: make BreakHandler::setState private
Christian Kandeler [Thu, 18 Nov 2010 16:52:25 +0000 (17:52 +0100)]
Output window: Revert
1d7cb01f64ef83aa397c4f773d415081ae850b53.
It was a quick fix for 2.1, but we want a real solution.
(See QTCREATORBUG-3073.)
dt [Thu, 18 Nov 2010 16:31:30 +0000 (17:31 +0100)]
FlatModel: The simplified tree did not react to hasBuildTarget changes
Task-Nr: QTCREATORBUG-3014
Task-Nr: QTCREATORBUG-2821
hjk [Thu, 18 Nov 2010 16:37:56 +0000 (17:37 +0100)]
debugger: make DebuggerEngine::setState private.
hjk [Thu, 18 Nov 2010 16:35:22 +0000 (17:35 +0100)]
debugger: remove unused DebuggerEngine::{set,is}Active
hjk [Thu, 18 Nov 2010 16:32:41 +0000 (17:32 +0100)]
debugger: code cosmetics
hjk [Thu, 18 Nov 2010 15:50:44 +0000 (16:50 +0100)]
debugger: move BreakpointId to the Debugger::Internal namespace
con [Thu, 18 Nov 2010 16:15:19 +0000 (17:15 +0100)]
Mac: Explicitly do a 10.5+ build if not doing a tiger compatible build.
Qt for some reason doesn't tell the tool chain to require 10.5 when
doing a cocoa build but on x86.
hjk [Thu, 18 Nov 2010 15:31:18 +0000 (16:31 +0100)]
debugger: take unusual marker file names into account when toggling breakpoints.
Friedemann Kleint [Thu, 18 Nov 2010 15:22:41 +0000 (16:22 +0100)]
Debugger: Use Symbol server nagging code in both CDB engines.
hjk [Thu, 18 Nov 2010 15:16:23 +0000 (16:16 +0100)]
debugger: fix some breakpoint state transitions in gdb engine
hjk [Thu, 18 Nov 2010 15:07:42 +0000 (16:07 +0100)]
debugger: stream line acknowledgement of breakpoint property changes
Friedemann Kleint [Thu, 18 Nov 2010 15:06:02 +0000 (16:06 +0100)]
Debugger[new CDB]: Handle command line arguments correctly.
hjk [Thu, 18 Nov 2010 15:00:56 +0000 (16:00 +0100)]
debugger: robustify file name reading on Mac
kh1 [Thu, 18 Nov 2010 14:58:55 +0000 (15:58 +0100)]
Specify the used charset, fixes e.g. polish translation.
hjk [Thu, 18 Nov 2010 14:47:50 +0000 (15:47 +0100)]
debugger: fix markers for breakpoints in constructors
hjk [Thu, 18 Nov 2010 13:57:00 +0000 (14:57 +0100)]
debugger: better synchronize icon selection for editor and view marker
Friedemann Kleint [Thu, 18 Nov 2010 14:47:07 +0000 (15:47 +0100)]
Debugger: CDB extension: Enable shadow-building.
con [Thu, 18 Nov 2010 14:46:15 +0000 (15:46 +0100)]
Avoid recursion and possibly endless recursion at removing file watches
Was introduced by the fix for QTCREATORBUG-965
Task-number: QTCREATORBUG-3116
Reviewed-by: dt
Friedemann Kleint [Thu, 18 Nov 2010 14:40:07 +0000 (15:40 +0100)]
Debugger: Fix broken display of containers with truncated item count.
Introduce convention '<>10 items>' meaning <more than 10 items>.
Task-number: QTCREATORBUG-3132