OSDN Git Service
hjk [Fri, 19 Nov 2010 07:37:43 +0000 (08:37 +0100)]
debugger: fix QRegion dumper for builds without debug info
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
Alessandro Portale [Thu, 18 Nov 2010 14:36:52 +0000 (15:36 +0100)]
Fixing the generation of examples.
Daniel Molkentin [Tue, 16 Nov 2010 18:10:13 +0000 (19:10 +0100)]
Move Qt QML projects to pro-based projects
Reviewed-by: dt
Daniel Molkentin [Thu, 18 Nov 2010 14:01:18 +0000 (15:01 +0100)]
Make preferred version work in all cases
Reviewed-by: dt
Erik Verbruggen [Thu, 18 Nov 2010 13:32:42 +0000 (14:32 +0100)]
CPPEditor: fix corner cases for complete-switch-statement quick-fix.
The condition resolving now looks through typedefs and calls.
Task-number: QTCREATORBUG-2051
Reviewed-by: Christian Kamm
Friedemann Kleint [Thu, 18 Nov 2010 12:57:15 +0000 (13:57 +0100)]
Debugger: Add missing .def-file for CDB.exe extension.
Friedemann Kleint [Thu, 18 Nov 2010 12:55:52 +0000 (13:55 +0100)]
Debugger: Add extension library to be loaded into CDB.exe
Friedemann Kleint [Thu, 18 Nov 2010 12:51:15 +0000 (13:51 +0100)]
Debugger: Add new CDB-engine.
Rubber-stamped-by: hjk
Francois Ferrand [Tue, 16 Nov 2010 11:58:30 +0000 (12:58 +0100)]
Fix argument count for functions with void argument.
This fixes highlighting calls to these functions.
Merge-request: 219
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
hjk [Thu, 18 Nov 2010 12:38:58 +0000 (13:38 +0100)]
debugger: don't replicate response.fileName as markerFileName etc.
hjk [Thu, 18 Nov 2010 11:30:56 +0000 (12:30 +0100)]
debugger: first step to re-enable breakpoint location update.
Friedemann Kleint [Thu, 18 Nov 2010 10:53:45 +0000 (11:53 +0100)]
Debugger/MSVC: Move MSVC-specific code around.
for new CDB engine.
Rhys Weatherley [Thu, 18 Nov 2010 05:57:44 +0000 (15:57 +1000)]
Use QString instead of std::string in GLSL parser
Rhys Weatherley [Thu, 18 Nov 2010 04:42:39 +0000 (14:42 +1000)]
Fix some bugs in GLSL AST generation in the parser
Rhys Weatherley [Thu, 18 Nov 2010 03:01:27 +0000 (13:01 +1000)]
GLSL AST nodes for function and struct decls
Christian Kandeler [Wed, 17 Nov 2010 17:22:23 +0000 (18:22 +0100)]
Maemo: Remove "cd" call from package creation preparation.
At some point, we thought it was necessary, but apparently it's not.
Reviewed-by: kh1
Roman Kovalev [Wed, 17 Nov 2010 16:20:22 +0000 (17:20 +0100)]
svn: annotate codec - bugfix
getCodec() needs to be called with an absolute file name.
As the changed decoding of the file contents will break the decoding of
svn's annotation prefixes (which are in system locale), force LC_ALL=C
to prevent an encoding mix in the first place.
Merge-request: 214
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Christian Kandeler [Wed, 17 Nov 2010 16:42:56 +0000 (17:42 +0100)]
Fix compilation for namespaced Qt.
Reviewed-by: Oswald Buddenhagen
Christian Kandeler [Wed, 17 Nov 2010 16:22:11 +0000 (17:22 +0100)]
Qt project file parsing: Take target options into account.
Reviewed-by: Oswald Buddenhagen
Reviewed-by: kh1
Reviewed-by: dt
Friedemann Kleint [Wed, 17 Nov 2010 16:16:34 +0000 (17:16 +0100)]
Debugger: Introduce common messages to engine.
Try to achieve consistency in reporting stop messages for all
engines. Report by BreakpointId if available.
Friedemann Kleint [Wed, 17 Nov 2010 16:01:51 +0000 (17:01 +0100)]
Debugger: Move some Windows functionality around.
Preparing the introduction of the new CDB engine.
Sergey Belyashov [Wed, 17 Nov 2010 15:53:06 +0000 (16:53 +0100)]
Updated Russian translation
Merge-request: 220
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Friedemann Kleint [Wed, 17 Nov 2010 15:22:00 +0000 (16:22 +0100)]
CodePaster: Fix listing of pastebin.com.
Skip multiple left-boxes (mobile section).
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Rubber-stamped-by: dt
Task-number: QTCREATORBUG-3118
Christian Kamm [Wed, 17 Nov 2010 13:48:25 +0000 (14:48 +0100)]
QmlJS: Implement context help and tooltips for properties.
Christian Kamm [Wed, 17 Nov 2010 13:20:06 +0000 (14:20 +0100)]
QmlJS: Return owning object from lookupMember.
Oswald Buddenhagen [Tue, 19 Oct 2010 15:51:52 +0000 (17:51 +0200)]
provide upgrade path for various user file changes
- command argument quoting changes
- environment expansion changes
- substitution of ${SOURCE,BUILD}DIR with %{{source,build}Dir}
- VariableManger syntax change ${} => %{}
Oswald Buddenhagen [Fri, 12 Nov 2010 16:23:55 +0000 (17:23 +0100)]
replace env variable injection with pervasive expando support
do not inject SOURCEDIR and BUILDDIR into the environment of
build steps and run configurations any more.
instead, all custom executable paths, argument lists and working
directories now support the %{sourceDir} and %{buildDir} macros.
this approach is more elegant and more scalable.
Oswald Buddenhagen [Tue, 19 Oct 2010 09:14:03 +0000 (11:14 +0200)]
overhaul process argument handling
get away from argument stringlists. instead, use native shell command
lines which support quoting/splitting, environment variable expansion
and redirections with well-understood semantics.
Task-number: QTCREATORBUG-542
Task-number: QTCREATORBUG-1564
Oswald Buddenhagen [Thu, 14 Oct 2010 16:05:43 +0000 (18:05 +0200)]
add Utils::QtcProcess
this is a wrapper around QProcess with these features:
- setEnvironment() takes a Utils::Environment instead of a QStringList
- instead of taking a stringlist with arguments, take a single shell
command string which is fully compatible with the system's native
shell (the bourne shell on unix and cmd.exe on windows) - with support
for environment variable expansion, and subject to the shell's
splitting and quoting rules. if the command is too complex (e.g.,
contains redirections), it is transparently executed through a real
shell.
- additionally, the class contains a set of helper functions for
manipulating (constructing, splitting, etc.) shell command lines.
in particular, it contains a shell-safe macro expander and the nested
class ArgIterator which can be used for inspecting and manipulating a
shell command line without going through the stringlist indirection
(which is potentially lossy).
some of this is based on KDE code (KShell and KMacroExpander) which i
have written myself.
Oswald Buddenhagen [Mon, 8 Nov 2010 18:54:19 +0000 (19:54 +0100)]
refactor VariableManager
make it provide a macroExpander() instead of a resolve() function.
this detaches the actual variable management from the string
manipulation.
Oswald Buddenhagen [Mon, 8 Nov 2010 20:09:19 +0000 (21:09 +0100)]
add generic macro expansion classes & functions to Utils
AbstractMacroExpander (any macros), AbstractQtcMacroExpander (%{var}
style macros, which is a hybrid of printf format specifiers and unix
environment expansions) and expandMacros() for the actual string
manipulation.
Oswald Buddenhagen [Wed, 3 Nov 2010 17:26:46 +0000 (18:26 +0100)]
change variable manager expansion style from ${} to %{}
this is less confusing, because it doesn't look like an environment
variable expansion under unix.
the syntax is a hybrid of printf format specifiers and braced unix
variable expansions.
Oswald Buddenhagen [Tue, 19 Oct 2010 09:10:58 +0000 (11:10 +0200)]
change Environment::expandVariables() semantics
instead of being os-agnostic, interpret the os-native expansion style,
so it is consistent with proper (shell) command lines.
don't interpret quotes, as this function is meant for expanding isolated
filepaths, where nobody would expect quoting. instead, use the windows
style of simply not doing an expansion if a referenced variable is not
found, which should be good enough - it's rather unlikely that something
which happens to be an expansion of an existing variable is actually not
meant to be one.
Thomas Hartmann [Wed, 17 Nov 2010 11:59:08 +0000 (12:59 +0100)]
QmlDesigner: adding a distinguished context for the form editor
Since Actions like copy/paste and delete interfiere
with controls like LineEdit, I added a special context
for the form editor. Now copy/paste/delete on the Qml items
are only registered for the form editor context and copying the contens
of a LineEdit will not lead to copy an item instead, anymore.
Reviewed-by: Kai Koehne
Arvid Ephraim Picciani [Wed, 17 Nov 2010 11:09:30 +0000 (12:09 +0100)]
Fix compilation
Tobias Hunger [Wed, 17 Nov 2010 09:37:11 +0000 (10:37 +0100)]
Symbian: Fix pathes
Fix pathes for Nokia Qt SDK:
* Set SBS path in one location only
* Fix up perl path
* Set path to CMD on windows. Both ABLD and SBSv2 actually need this.
* Set GCC path only if the directory actually exists
These fixes allow for building both ABLD and SBSv2 based projects in
a clean environment.
Reviewed-by: Tim Jenssen
Leandro Melo [Wed, 17 Nov 2010 10:00:51 +0000 (11:00 +0100)]
Tooltips: Fix brief description for QML elements
The brief description was not being shown. The help id for a
QML element is something like QML.Item while the extraction
mark is simply Item.
Reviewed-by: Thomas Hartmann
Reviewed-by: con
Christian Kandeler [Wed, 17 Nov 2010 10:09:40 +0000 (11:09 +0100)]
Maemo: Use current build environment for packaging.
(Instead of the initial system environment.)
Reviewed-by: kh1
Friedemann Kleint [Wed, 17 Nov 2010 07:28:35 +0000 (08:28 +0100)]
Debugger: Compile CDB
Rhys Weatherley [Wed, 17 Nov 2010 04:46:11 +0000 (14:46 +1000)]
Variable and parameter declarations for GLSL
Rhys Weatherley [Wed, 17 Nov 2010 00:53:32 +0000 (10:53 +1000)]
Add extra variant flags for GLSL keywords
Alessandro Portale [Tue, 16 Nov 2010 19:57:22 +0000 (20:57 +0100)]
Fixing the generation of Qt Quick examples
Alessandro Portale [Tue, 16 Nov 2010 19:56:01 +0000 (20:56 +0100)]
Filtering '-' out of generated projects
(In QtCreator the wizard would take care of that.)
hjk [Tue, 16 Nov 2010 17:20:52 +0000 (18:20 +0100)]
debugger: remove breakpoint notification indirection through the engine
hjk [Tue, 16 Nov 2010 17:14:00 +0000 (18:14 +0100)]
debugger: handle disabled breakpoints on debugger startup again
hjk [Tue, 16 Nov 2010 16:53:08 +0000 (17:53 +0100)]
debugger: replace BreakpointPending state with a flag in BreakpointResponse
To keep the breakpoint state machinery simple
hjk [Tue, 16 Nov 2010 16:29:38 +0000 (17:29 +0100)]
debugger: fix cut&paste error in breakpoint states
Morten Engvoldsen [Tue, 16 Nov 2010 17:03:06 +0000 (18:03 +0100)]
Updating QML examples list for deployment on device.
hjk [Tue, 16 Nov 2010 16:09:25 +0000 (17:09 +0100)]
debugger: fix display of '"' chars
Task-number: QTCREATORBUG-3084
hjk [Tue, 16 Nov 2010 15:10:55 +0000 (16:10 +0100)]
debugger: add a few permitted breakpoint state transitions
hjk [Tue, 16 Nov 2010 12:52:21 +0000 (13:52 +0100)]
debugger: start tightening the breakpoint state machinery
Robert Loehning [Tue, 16 Nov 2010 15:26:29 +0000 (16:26 +0100)]
debugger: Added comment about unexpected behavior
Christiaan Janssen [Tue, 16 Nov 2010 15:17:16 +0000 (16:17 +0100)]
QmlDebugger: Fixing QmlCppEngine for failed setup due to timed out connection
kh1 [Tue, 16 Nov 2010 13:16:48 +0000 (14:16 +0100)]
Cannot reset font size for help when shown in side pane.
Task-number: QTCREATORBUG-2924
Reviewed-by: ck
kh1 [Tue, 16 Nov 2010 13:15:23 +0000 (14:15 +0100)]
Fix ambiguity with help manager by renaming the file to match class.
Task-number: QTCREATORBUG-3090
Reviewed-by: ck
Christian Kamm [Tue, 16 Nov 2010 13:39:54 +0000 (14:39 +0100)]
QmlJS: Make follow symbol work with member properties.
A full evaluate() call resolves the property and continues to the
underlying type. If we use Evaluate::reference() instead, we only the
first step is done and we can get at the source location if a
ASTPropertyReference is returned.
Reviewed-by: Erik Verbruggen
Christian Kamm [Tue, 16 Nov 2010 12:54:50 +0000 (13:54 +0100)]
QmlJS: Add a filter for functions to the locator.
Task-number: QTCREATORBUG-2607
Reviewed-by: Erik Verbruggen
Christian Kamm [Tue, 16 Nov 2010 12:53:39 +0000 (13:53 +0100)]
QmlJS: Also bind FunctionExpressions.
Reviewed-by: Erik Verbruggen
Christian Kamm [Tue, 16 Nov 2010 12:40:23 +0000 (13:40 +0100)]
Locator: Use all matching filters, not just the highest priority one.
Reviewed-by: con
hjk [Tue, 16 Nov 2010 11:52:02 +0000 (12:52 +0100)]
debugger: some simplification after engine objects are no more re-used
hjk [Tue, 16 Nov 2010 11:42:57 +0000 (12:42 +0100)]
debugger: make the command timer a direct member of GdbEngine
hjk [Tue, 16 Nov 2010 10:55:48 +0000 (11:55 +0100)]
debugger: breakpoint code cosmetics
Friedemann Kleint [Tue, 16 Nov 2010 11:38:50 +0000 (12:38 +0100)]
Debugger: Stop in case of gdb crash in InferiorStop.
Reviewed-by: hjk
Task-number: QTCREATORBUG-3099
con [Tue, 16 Nov 2010 11:33:04 +0000 (12:33 +0100)]
Stupid editor adding tabs instead of spaces...
con [Tue, 16 Nov 2010 11:30:50 +0000 (12:30 +0100)]
Fix tool buttons in details widget on Mac with raster engine.
Task-number: QTBUG-15170
Friedemann Kleint [Tue, 16 Nov 2010 11:17:00 +0000 (12:17 +0100)]
Debugger: Fix useFullPath in gdb.
hjk [Tue, 16 Nov 2010 10:48:17 +0000 (11:48 +0100)]
debugger: remove intermediate BreakpointData stucture layer
Friedemann Kleint [Tue, 16 Nov 2010 10:42:20 +0000 (11:42 +0100)]
Debugger/BreakpointDialog: Show only data applicable to type.
Clear controls that are not applicable to type, but save
and restore their value once the type is again choosen.
hjk [Tue, 16 Nov 2010 10:12:05 +0000 (11:12 +0100)]
debugger: potentia;l cdb compile fix
hjk [Tue, 16 Nov 2010 10:06:09 +0000 (11:06 +0100)]
debugger: looks like the BreakpointData layer is going to be unneeded.
Kai Koehne [Thu, 11 Nov 2010 15:50:45 +0000 (16:50 +0100)]
QmlObserver: Fix navigation on Mac OS X
The QmlObserver relies on installing an event handler on the graphicsview
viewport, to get e.g. Mouse events.
QmlObserver on Mac OS X switches the viewport later on to a QGLViewPort, when
QmlObserver has already been set up ... Make QmlObserver aware of this by
listening to the ChildRemoved event that will be signalled in this case.
Task-number: QTCREATORBUG-2892
Reviewed-by: Lasse Holmstedt
hjk [Tue, 16 Nov 2010 09:50:11 +0000 (10:50 +0100)]
debugger: more breakpoint refactoring
hjk [Mon, 15 Nov 2010 18:07:47 +0000 (19:07 +0100)]
debugger: code cosmetics
hjk [Mon, 15 Nov 2010 18:05:31 +0000 (19:05 +0100)]
debugger: move marker filename and linenumber to BreakpointItem