OSDN Git Service
Tobias Hunger [Fri, 8 Apr 2011 08:42:07 +0000 (10:42 +0200)]
VCS: Do not offer to revert a chunk when in a diff header
Do not offer to revert a chunk when in a diff header
Tobias Hunger [Fri, 8 Apr 2011 08:40:59 +0000 (10:40 +0200)]
VCS: Do not jump to any file when in the diff header
Do not jump to a file on double-click when in a diff header.
Task-number: QTCREATORBUG-4364
Tobias Hunger [Fri, 8 Apr 2011 08:56:09 +0000 (10:56 +0200)]
Describe folding indents of the DiffHighlighter
Tobias Hunger [Thu, 7 Apr 2011 12:56:23 +0000 (14:56 +0200)]
Symbian: Be more clever about figuring out SBS path
hjk [Thu, 7 Apr 2011 15:59:12 +0000 (17:59 +0200)]
fakevim: Try to fix Ctrl on Mac. Again.
How clever can "clever default behaviour" get before it turns unclever...
hjk [Thu, 7 Apr 2011 13:12:48 +0000 (15:12 +0200)]
debugger: code cosmetics
Christian Kandeler [Thu, 7 Apr 2011 15:02:30 +0000 (17:02 +0200)]
Maemo: Manually create directories when deploying without packaging.
Task-number: QTCREATORBUG-4398
Christian Kandeler [Thu, 7 Apr 2011 14:38:03 +0000 (16:38 +0200)]
S60: Fix gcc warning.
Christian Kandeler [Thu, 7 Apr 2011 14:34:13 +0000 (16:34 +0200)]
Maemo: Allow tarball deployment for non-Harmattan targets.
Christian Kandeler [Thu, 7 Apr 2011 14:20:46 +0000 (16:20 +0200)]
Maemo: Fix tarball installation.
Busybox tar does not have --absolute-names.
Christian Kandeler [Thu, 7 Apr 2011 14:18:57 +0000 (16:18 +0200)]
Maemo: Better detection of deployconfig changes relevant to runconfig.
Christian Kandeler [Thu, 7 Apr 2011 13:45:26 +0000 (15:45 +0200)]
Maemo: Fix race condition when removing a deploy step.
Christian Kandeler [Thu, 7 Apr 2011 13:26:08 +0000 (15:26 +0200)]
Maemo: Fix crash in run config with non-Maemo deploy configuration.
Pawel Polanski [Thu, 7 Apr 2011 14:02:48 +0000 (16:02 +0200)]
Symbian: extra safety measures
Pawel Polanski [Wed, 6 Apr 2011 11:09:10 +0000 (13:09 +0200)]
CODA: Dots indicating that a copy process is in progress
Pawel Polanski [Wed, 6 Apr 2011 11:06:55 +0000 (13:06 +0200)]
CODA: Some extra cleanup is done when a Cancel gets pressed
Pawel Polanski [Tue, 5 Apr 2011 14:48:23 +0000 (16:48 +0200)]
Symbian: fixed a output window bug that came form fixing window related bug
dt [Tue, 5 Apr 2011 11:53:54 +0000 (13:53 +0200)]
Settings dialog: fix flashing of widget
Reviewed-By: con
Reviewed-By: Robert Loehning
Tobias Hunger [Thu, 7 Apr 2011 12:33:26 +0000 (14:33 +0200)]
Qt: Make sure clean up does not remove autodetected Qts
Bill King [Thu, 7 Apr 2011 11:33:22 +0000 (13:33 +0200)]
tests: Fix a linking issue.
Christian Kandeler [Thu, 7 Apr 2011 09:44:11 +0000 (11:44 +0200)]
Maemo: Refactor upload + install deployment step.
Christian Kandeler [Thu, 7 Apr 2011 09:39:38 +0000 (11:39 +0200)]
Maemo: Fix tarball creation.
Bill King [Thu, 7 Apr 2011 09:13:30 +0000 (11:13 +0200)]
tests: cleanup of test projects. Also, add rpathing where needed.
Oswald Buddenhagen [Thu, 7 Apr 2011 08:12:39 +0000 (10:12 +0200)]
Merge remote branch 'origin/2.2'
Bill King [Thu, 7 Apr 2011 07:10:37 +0000 (09:10 +0200)]
tests: Make them compile again properly
Oswald Buddenhagen [Wed, 6 Apr 2011 19:26:20 +0000 (21:26 +0200)]
continue parsing line despite errors
as far as possible, anyway. and suppress messages after the first one.
this avoids that scope nesting gets thrown off and thus spurious
followup-errors crop up.
as a "side effect", this fixes a crash resulting from us rewinding the
token stream but ignoring the block stack on the way.
Task-number: QTCREATORBUG-4368
Oswald Buddenhagen [Tue, 5 Apr 2011 15:04:03 +0000 (17:04 +0200)]
reshuffle word counting in expressions
this makes the value list sizehints more correct: instead of the number
of literals and expansions, it's now the number of actual words, and
that only if the expression starts with a literal (otherwise the
pre-allocation is discarded anyway).
the performance impact seems negligible, with qt being a tad slower and
creator a tad faster.
as a side effect, complaining about excess words in a test expression
does not immediately terminate the current line's parsing.
Oswald Buddenhagen [Tue, 5 Apr 2011 09:16:37 +0000 (11:16 +0200)]
remove useless initializations
reverts
6f5bf29e. coverity sucks, thankyouverymuch.
Oswald Buddenhagen [Mon, 4 Apr 2011 18:48:29 +0000 (20:48 +0200)]
const-correctness
Oswald Buddenhagen [Mon, 4 Apr 2011 16:17:08 +0000 (18:17 +0200)]
simplify copy c'tor
Oswald Buddenhagen [Tue, 5 Apr 2011 15:27:39 +0000 (17:27 +0200)]
support QT_INSTALL_IMPORTS in testreader
hjk [Wed, 6 Apr 2011 16:39:56 +0000 (18:39 +0200)]
debugger: make original value of automatically dereferenced pointer accessible
hjk [Wed, 6 Apr 2011 16:26:27 +0000 (18:26 +0200)]
debugger: remove unused variable
hjk [Wed, 6 Apr 2011 16:11:14 +0000 (18:11 +0200)]
debugger: switch order of item and type specific entries in l&w context menu
On Mr B.'s request.
hjk [Wed, 6 Apr 2011 13:19:15 +0000 (15:19 +0200)]
bookmarks: minor style changes
hjk [Wed, 6 Apr 2011 15:34:08 +0000 (17:34 +0200)]
debugger: display inability to "finish" in status line
Reviewed-by: Friedemann Kleint
Task-number: QTCREATORBUG-4382
Leandro Melo [Wed, 6 Apr 2011 14:37:02 +0000 (16:37 +0200)]
Remove grid from highlight definitions table view
Reviewed-by: con
Leandro Melo [Wed, 6 Apr 2011 14:10:51 +0000 (16:10 +0200)]
Remove grid from snippets table view
Reviewed-by: con
Christiaan Janssen [Wed, 6 Apr 2011 14:04:18 +0000 (16:04 +0200)]
QmlProfiler: added 'clear view'
Reviewed-by: Kai Koehne
Leandro Melo [Wed, 6 Apr 2011 09:47:48 +0000 (11:47 +0200)]
Fix duplicate mime types in the user file
Also avoid writing the file on every apply and do it
only when the dialog is finished.
Reset can still be improved to take effect immediately.
Reviewed-by: con
hjk [Wed, 6 Apr 2011 12:55:26 +0000 (14:55 +0200)]
fakevim: support snippets, by doing nothing.
Reviewed-by: con
Task-number: QTCREATORBUG-4379
Friedemann Kleint [Wed, 6 Apr 2011 12:07:09 +0000 (14:07 +0200)]
Debugger: Fix change-indication of registers.
Emit dataChanged() on changed values.
Friedemann Kleint [Wed, 6 Apr 2011 11:59:06 +0000 (13:59 +0200)]
VCS: Fix unintented showing of description in log editor.
In a log editor, releasing the mouse over a chunk of text
while selecting would trigger the opening of the description.
Prevent that by adding a flag indicating button drag,
ensuring it works only when no button is pressed.
Task-number: QTCREATORBUG-4385
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
Pawel Polanski [Wed, 6 Apr 2011 11:20:43 +0000 (13:20 +0200)]
CODA: CODA responds to the Device Removed event
Friedemann Kleint [Wed, 6 Apr 2011 11:31:37 +0000 (13:31 +0200)]
Compile fix
Kai Koehne [Wed, 6 Apr 2011 10:35:56 +0000 (12:35 +0200)]
QuickDesigner: Jump to right column for QML syntax errors
column count for errors start with 1.
Task-number: QTCREATORBUG-4347
Reviewed-by: Thomas Hartmann
Kai Koehne [Wed, 6 Apr 2011 10:18:45 +0000 (12:18 +0200)]
QMakeStep: Fix qmljsdebugger warning issues
Debugging requires 4.7.1 minimum. Also update the label if the
user switches Qt versions.
Reviewed-by: dt
dt [Wed, 6 Apr 2011 11:13:41 +0000 (13:13 +0200)]
FakeVim: Add missing endArray() to settings reading
Reviewed-By: hjk
Christiaan Janssen [Wed, 6 Apr 2011 10:26:19 +0000 (12:26 +0200)]
qQmlProfiler: independent start/stop/record buttons
Reviewed-by: Kai Koehne
Leena Miettinen [Wed, 6 Apr 2011 08:54:38 +0000 (10:54 +0200)]
Doc: differences between integrated and stand-alone Qt Designer
Task-number: QTCREATORBUG-3592
Reviewed-by: Friedemann Kleint
Leena Miettinen [Tue, 5 Apr 2011 14:53:42 +0000 (16:53 +0200)]
Doc: differences in displaying application output
Reviewed-by: Friedemann Kleint
Leena Miettinen [Tue, 5 Apr 2011 09:54:34 +0000 (11:54 +0200)]
Doc: remove obsolete note
Leena Miettinen [Tue, 5 Apr 2011 09:54:11 +0000 (11:54 +0200)]
Doc: remove obsolete info
Leena Miettinen [Tue, 5 Apr 2011 09:53:44 +0000 (11:53 +0200)]
Doc: fix formatting
Erik Verbruggen [Wed, 6 Apr 2011 07:19:46 +0000 (09:19 +0200)]
Fixed import of "." in a library with a hack.
Task-number: QTCREATORBUG-4198
Reviewed-by: Kai Koehne
Christian Kandeler [Wed, 6 Apr 2011 08:31:27 +0000 (10:31 +0200)]
SSH: Move private class into internal namespace.
Christian Kandeler [Wed, 6 Apr 2011 08:26:45 +0000 (10:26 +0200)]
SSH: Implement terminal support and corresponding tests.
Task-number: QTCREATORBUG-3891
Christian Kandeler [Wed, 6 Apr 2011 07:38:13 +0000 (09:38 +0200)]
SSH: Adapt tests to API change.
Tobias Hunger [Wed, 6 Apr 2011 08:04:57 +0000 (10:04 +0200)]
Abi: Mips support
* Detect Mips in binaries
* Parse mips gcc string properly
* Add unit tests for both
Thanks go to fralik from devnet for providing the test data!
Marco Bubke [Tue, 5 Apr 2011 13:11:49 +0000 (15:11 +0200)]
QmlDesigner: Remove qDebug
Reviewed-by: Thomas Hartmann
Christian Kandeler [Tue, 5 Apr 2011 15:25:10 +0000 (17:25 +0200)]
Maemo: Implement tar package creation step.
Currently unused.
hjk [Tue, 5 Apr 2011 15:11:00 +0000 (17:11 +0200)]
mimetypes: remove grid lines from table view
More consistent.
Reviewed-by: Leandro Melo
hjk [Tue, 5 Apr 2011 14:32:18 +0000 (16:32 +0200)]
fakevim: allow main texteditor to call into fakevim
hjk [Tue, 5 Apr 2011 09:11:57 +0000 (11:11 +0200)]
callgrind: simplify inheritance tree by removing AbstractModel
hjk [Mon, 4 Apr 2011 17:09:38 +0000 (19:09 +0200)]
valgrind: remove HistoryItem and FunctionHistoryItem
Christian Kandeler [Tue, 5 Apr 2011 15:04:39 +0000 (17:04 +0200)]
Maemo: Fix merging artifact.
Christian Kandeler [Mon, 4 Apr 2011 14:21:53 +0000 (16:21 +0200)]
Maemo: Use devrootsh only when not connected as root.
Christian Kandeler [Mon, 4 Apr 2011 10:10:36 +0000 (12:10 +0200)]
Maemo: Remove unused function.
Thomas Hartmann [Tue, 5 Apr 2011 14:43:38 +0000 (16:43 +0200)]
QmlDesigner.model: bugfix for TabBar
A defaultProperty is always a list property.
Reviewed-by: Marco Bubke
Thomas Hartmann [Tue, 5 Apr 2011 14:42:37 +0000 (16:42 +0200)]
QmlDesigner.model: crash fix
Reviewed-by: Marco Bubke
Thomas Hartmann [Tue, 5 Apr 2011 14:41:49 +0000 (16:41 +0200)]
QmlDesigner.propertyEditor: crash fix
Reviewed-by: Marco Bubke
Bill King [Tue, 5 Apr 2011 14:43:24 +0000 (16:43 +0200)]
Merge branch '2.2'
Conflicts:
src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
src/plugins/qt4projectmanager/qt-maemo/qt4maemotarget.cpp
src/plugins/qt4projectmanager/qt-maemo/qt4maemotarget.h
Friedemann Kleint [Tue, 5 Apr 2011 13:19:44 +0000 (15:19 +0200)]
Debugger[CDB]: Reduce verbosity.
Bill King [Tue, 5 Apr 2011 13:07:16 +0000 (15:07 +0200)]
Fixes msvc compilation switch to correct check.
Bill King [Tue, 5 Apr 2011 13:03:13 +0000 (15:03 +0200)]
tests: get autotests compiling again.
Friedemann Kleint [Tue, 5 Apr 2011 13:00:15 +0000 (15:00 +0200)]
Debugger[CDB]: Simple dumpers for ScriptValue, QHostAddress, QProcess
Dump by reading raw memory for further types for whose private
classes no symbolic information is available.
Also fix dumping for pointer values, taking CDB's pointer/value
duality into account.
Marco Bubke [Tue, 5 Apr 2011 11:42:00 +0000 (13:42 +0200)]
QmlDesigner: Canvas setting now reflected
Task-number: QTCREATORBUG-4317
Reviewed-by: Thomas Hartmann
Thomas Hartmann [Tue, 5 Apr 2011 11:42:33 +0000 (13:42 +0200)]
QmlDesigner.propertyEditor: fix for layout issues on Windows 7
Reviewed-by: Marco Bubke
Marco Bubke [Tue, 5 Apr 2011 11:42:00 +0000 (13:42 +0200)]
QmlDesigner: Canvas setting now reflected
Task-number: QTCREATORBUG-4317
Reviewed-by: Thomas Hartmann
dt [Mon, 4 Apr 2011 11:48:28 +0000 (13:48 +0200)]
TargetSetupPage: Fix expanding logic
Reviewed-By: Robert Loehning
Christiaan Janssen [Tue, 5 Apr 2011 10:49:02 +0000 (12:49 +0200)]
QmlProfiler: rendering optimizations
Reviewed-by: Kai Koehne
Friedemann Kleint [Tue, 5 Apr 2011 09:35:15 +0000 (11:35 +0200)]
Fix Analyzer-related exit crash on Windows.
Kai Koehne [Tue, 5 Apr 2011 08:33:16 +0000 (10:33 +0200)]
QmlPuppet: Fix compilation with no webkit
Reviewed-by: Thomas Hartmann
Christian Kandeler [Tue, 5 Apr 2011 07:07:33 +0000 (09:07 +0200)]
Maemo: Fix package metadata initialization bug.
We must check whether a target is fully initialized (meaning it
already has packaging metadata). Otherwise we will initialize one
target with bogus values from another, equally uninitialized one
when they are created at the same time (i.e. by a wizard).
Leena Miettinen [Tue, 5 Apr 2011 07:35:49 +0000 (09:35 +0200)]
Doc: polishing
Leena Miettinen [Tue, 5 Apr 2011 07:35:02 +0000 (09:35 +0200)]
Doc: correct order of selecting anchor buttons
Leena Miettinen [Tue, 5 Apr 2011 07:34:11 +0000 (09:34 +0200)]
Doc: restoring sessions
Leena Miettinen [Tue, 5 Apr 2011 07:32:41 +0000 (09:32 +0200)]
Doc: update screen shots
Pawel Polanski [Mon, 4 Apr 2011 15:03:36 +0000 (17:03 +0200)]
Symbian: crashes if canceled in a certain moment of package creation
Kai Koehne [Mon, 4 Apr 2011 14:59:40 +0000 (16:59 +0200)]
QmlProfiler: Fix OTHER_FILES section
Pawel Polanski [Mon, 4 Apr 2011 14:24:46 +0000 (16:24 +0200)]
CODA: CODA can crash while copying to device
Friedemann Kleint [Mon, 4 Apr 2011 14:15:03 +0000 (16:15 +0200)]
Debugger: Add size to watch data.
Have CDB report it, pass it on to adding watches.
Friedemann Kleint [Mon, 4 Apr 2011 14:05:04 +0000 (16:05 +0200)]
Analyzer: Add missing dependency of Qt4ProjectManager.
Friedemann Kleint [Mon, 4 Apr 2011 14:00:13 +0000 (16:00 +0200)]
Analyzer: Add missing dependency of Qt4ProjectManager.
Kai Koehne [Mon, 4 Apr 2011 13:56:34 +0000 (15:56 +0200)]
QmlProfiler: Enable attach action only if profiler is current tool
Kai Koehne [Mon, 4 Apr 2011 13:03:31 +0000 (15:03 +0200)]
QmlProfiler: Add attach/detach menu entry
This allows one to also profile apps on device (as long as there
is a working TCP/IP connection).
Kai Koehne [Mon, 4 Apr 2011 13:00:18 +0000 (15:00 +0200)]
AnalyzerManager: Export switching to analyzer mode
Kai Koehne [Mon, 4 Apr 2011 11:03:45 +0000 (13:03 +0200)]
AnalyzerManager: Make menu extendible
Use Commands everywhere, so that other plugins can extend it.
Kai Koehne [Mon, 4 Apr 2011 08:52:40 +0000 (10:52 +0200)]
QmlProfiler: Fix typo
Kai Koehne [Mon, 4 Apr 2011 08:52:04 +0000 (10:52 +0200)]
QmlProfiler: Move qrc resources in qmlprofiler namespace