OSDN Git Service
Christian Kamm [Thu, 28 Apr 2011 09:35:57 +0000 (11:35 +0200)]
Don't adjust DYLD_LIBRARY_PATH in run environments.
Reviewed-by: con
Christian Kandeler [Thu, 28 Apr 2011 09:12:34 +0000 (11:12 +0200)]
SSH: Don't send keep-alive packet during key exchange.
Only certain types of messages are allowed in that phase.
Christian Kandeler [Thu, 28 Apr 2011 08:57:17 +0000 (10:57 +0200)]
SSH: Fix key re-exchange bug.
We used the encrypted client payload by mistake. The bug only manifests
itself from the second key exchange on, because during the first one,
no encryption is active, so the "encrypted" payload is the same as
the non-encrypted one.
Friedemann Kleint [Thu, 28 Apr 2011 09:11:34 +0000 (11:11 +0200)]
Debugger[CDB]: Use file normalization function from utils.
Remove complicated/expensive function in dbgwinutils
in favour of the utils one (improved to upper case
the drive letter) as it is sufficient now with
the improved checking in editor manager/location mark.
Friedemann Kleint [Thu, 28 Apr 2011 09:10:01 +0000 (11:10 +0200)]
Debugger/GDB: Fix file names according to host-ABI
Task-number: QTCREATORBUG-4648
Christian Kamm [Thu, 28 Apr 2011 07:20:53 +0000 (09:20 +0200)]
QmlJS: Complete trailing / in file name completion.
Also restart completion when a directory was completed.
Christian Kamm [Wed, 27 Apr 2011 11:21:24 +0000 (13:21 +0200)]
Set LD_LIBRARY_PATH in unix run environments.
Similarly to how PATH is set up for Windows. The background is that
without it plugin loading can pull in incompatible Qt libraries if the
binary is compiled with RUNPATH instead of RPATH.
Reviewed-by: Daniel Teske
Thomas Hartmann [Thu, 28 Apr 2011 08:41:03 +0000 (10:41 +0200)]
QmlDump: fix path import dumps on Windows
Absolute file pathes containing drive identifiers do not work in qml.
(C:\)
workaround: use "." imports and setting the component url.
Reviewed-by: Christian Kamm
Friedemann Kleint [Thu, 28 Apr 2011 08:02:34 +0000 (10:02 +0200)]
Debugger: Use base class PID mechanism in CDB.
Fix base engine to raise app only in applicable modes.
con [Thu, 28 Apr 2011 07:26:17 +0000 (09:26 +0200)]
Added the overview part.
Christian Kandeler [Thu, 28 Apr 2011 06:44:55 +0000 (08:44 +0200)]
Maemo: Small refactoring in configuration test dialog.
Leena Miettinen [Wed, 27 Apr 2011 15:35:17 +0000 (17:35 +0200)]
Doc: add doc project for the Extending Qt Creator Manual
Kai Koehne [Wed, 27 Apr 2011 15:20:44 +0000 (17:20 +0200)]
QmlObserver: Disable crumblepath if not active
Kai Koehne [Tue, 26 Apr 2011 14:39:51 +0000 (16:39 +0200)]
Qt4Target Page: Filter out QMLJSDEBUGGER_PATH when importing build
Don't add QMLJSDEBUGGER_PATH to the list of customer qmake arguments
when importing a built on the target page.
Task-number: QTCREATORBUG-4694
Reviewed-by: dt
Kai Koehne [Tue, 26 Apr 2011 07:46:05 +0000 (09:46 +0200)]
QmlDebug: Simplify logic to find the source file for a stack frame
Get rid of custom logic to handle shadow builds (which didn't work
anyway if the qml files are from a different directory than expected).
Instead, just search for the file name in the list of files from the
project.
Reviewed-by: Christiaan Janssen
dt_ [Wed, 27 Apr 2011 14:33:21 +0000 (16:33 +0200)]
Add "Run in terminal" option also to cmake runconfigurations
Task-Nr: QTCREATORBUG-4695
dt_ [Wed, 27 Apr 2011 13:52:24 +0000 (15:52 +0200)]
Handle internally triggered deletes more gracefull
If the user has enabled "Reload unmodified" then on remove the
unmodified editors are closed. Otherwise the user is asked as before.
Also modify the message to indicate if the change was triggred
externally.
dt_ [Wed, 27 Apr 2011 13:51:35 +0000 (15:51 +0200)]
Run cmake dialog: More intelligent hardcoded font
Platform specific now.
Leena Miettinen [Wed, 27 Apr 2011 13:41:34 +0000 (15:41 +0200)]
Doc: add front page for Extending Qt Creator Manual
con [Wed, 27 Apr 2011 13:27:44 +0000 (15:27 +0200)]
"Open Terminal Here" should open Terminal.app on Mac.
It was starting X11 and a xterm...
Task-number: QTCREATORBUG-4683
dt_ [Wed, 27 Apr 2011 12:55:36 +0000 (14:55 +0200)]
Do not add a release configuration for Symbian Emulator
Task-Nr: QTCREATORBUG-4649
dt_ [Wed, 27 Apr 2011 12:41:15 +0000 (14:41 +0200)]
Always append cmake output
dt_ [Wed, 27 Apr 2011 12:40:14 +0000 (14:40 +0200)]
Use fixed font in the cmake output window
Task-Nr: QTCREATORBUG-4658
dt_ [Wed, 27 Apr 2011 11:35:48 +0000 (13:35 +0200)]
Fix warning in watchwindow.cpp
Reviewed-By: Friedemann Kleint
Thomas Hartmann [Wed, 27 Apr 2011 12:24:15 +0000 (14:24 +0200)]
QmlDesigner.itemLibrary: adding plugin for extra components
A new extra component plugin.
con [Wed, 27 Apr 2011 09:27:29 +0000 (11:27 +0200)]
Merge remote branch 'origin/2.2'
Conflicts:
src/plugins/projectexplorer/gcctoolchain.cpp
src/plugins/projectexplorer/target.cpp
src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
Friedemann Kleint [Wed, 27 Apr 2011 08:26:44 +0000 (10:26 +0200)]
Debugger: Fix long tooltips in GDB settings.
Task-number: QTCREATORBUG-4703
con [Wed, 27 Apr 2011 07:25:16 +0000 (09:25 +0200)]
Debug views menu would show after using the text marker menu.
The right-click event that is handled by the extra text area for the
marker menu needs to be accepted, so it's not propagated further as a
context menu event.
Reviewed-by: Friedemann Kleint
Tobias Hunger [Wed, 13 Apr 2011 13:50:14 +0000 (15:50 +0200)]
Stop QTC_ASSERT from being triggered
Set up UI elements before they are used. No crash since the elements
are guarded by QTC_ASSERTs, but annoying output.
(cherry picked from commit
1df460426b2e409cccdb38254261f75fa686e924)
Christian Kandeler [Tue, 26 Apr 2011 14:48:45 +0000 (16:48 +0200)]
Maemo: Make shared pointer an actual QSharedPointer.
Pointer was left dangling when a deploy configuration was removed.
Christiaan Janssen [Tue, 26 Apr 2011 12:08:09 +0000 (14:08 +0200)]
QmlProfiler: corrected display name
Reviewed-by: Friedemann Kleint
Christian Kamm [Tue, 26 Apr 2011 12:42:33 +0000 (14:42 +0200)]
QmlJS: Disable unhelpful warning.
(cherry picked from commit
a03de5f717a033f35c5f701e865b2ac5a3c53898)
Christian Kandeler [Tue, 26 Apr 2011 13:02:33 +0000 (15:02 +0200)]
QtVersion: Add sysroot for Meego.
Christian Kandeler [Tue, 26 Apr 2011 13:01:11 +0000 (15:01 +0200)]
Maemo: Remove unneeded reference to MaemoToolchain.
Christian Kamm [Tue, 26 Apr 2011 12:42:33 +0000 (14:42 +0200)]
QmlJS: Disable unhelpful warning.
Thomas Hartmann [Tue, 26 Apr 2011 11:11:23 +0000 (13:11 +0200)]
QmlDesigner.qmlPuppet: fixes a bug when dragging in a WebView on KDE
WebView object contains a QIcon property ("reload.icon"),
which fails to be streamed from the puppet (client) to Qt Creator (server).
The QIcon is created by a 'KIconEngine' in the KDE case.
which isn't found on the QtCreator side.
This leads operator>> in qicon.cpp to not read anything from
the buffer at all ... leading to all following properties being
invalid, since read from the wrong bytes in the stream.
Solution: Since QIcon leads to problems and we have no current use case
for a QIcon property in Bauhaus we just ignore properties of type QIcon.
Reviewed-by: Marco Bubke
Task-number: QTCREATORBUG-4596
Friedemann Kleint [Tue, 26 Apr 2011 11:43:08 +0000 (13:43 +0200)]
Analyzer: Store FancyMainWindow defaults without QSettings.
Store hash directly, do not keep QSettings objects around.
Christian Kandeler [Tue, 26 Apr 2011 11:34:30 +0000 (13:34 +0200)]
Maemo: Make deploy step widget extensible.
Christian Kandeler [Tue, 26 Apr 2011 10:40:26 +0000 (12:40 +0200)]
Maemo: Show the name of deploy steps in their associated widgets.
con [Tue, 26 Apr 2011 11:18:56 +0000 (13:18 +0200)]
Fix context registration for project tree.
Broke with IContext refactoring.
Christian Kandeler [Tue, 26 Apr 2011 10:10:37 +0000 (12:10 +0200)]
Maemo: Use devrootsh only on remote systems that have MAD developer.
Thorbjørn Lindeijer [Tue, 26 Apr 2011 09:46:34 +0000 (11:46 +0200)]
Coding style
Thorbjørn Lindeijer [Tue, 26 Apr 2011 09:42:50 +0000 (11:42 +0200)]
Removed set-but-unused variable 'pos'
New warning in GCC 4.6.0. Plenty of other cases.
con [Tue, 26 Apr 2011 09:33:37 +0000 (11:33 +0200)]
Coding style.
con [Tue, 26 Apr 2011 09:32:17 +0000 (11:32 +0200)]
Show wizard's cancel button even on Mac.
Task-number: QTCREATORBUG-4655
Sergey Belyashov [Fri, 22 Apr 2011 14:30:13 +0000 (18:30 +0400)]
Updated Russian translation
con [Thu, 21 Apr 2011 11:42:17 +0000 (13:42 +0200)]
Re-use output window implementation for general messages.
Moving the implementation to core plugin.
con [Thu, 14 Apr 2011 08:39:09 +0000 (10:39 +0200)]
Make output window implementation reusable.
Removes the dependencies to project explorer and text editor plugins
and moves unrelated code to its own file.
con [Fri, 15 Apr 2011 10:59:44 +0000 (12:59 +0200)]
Move OutputFormatter to Utils lib.
Oswald Buddenhagen [Tue, 26 Apr 2011 08:31:28 +0000 (10:31 +0200)]
fix quoting of strings with spaces and backslashes at the end
the regexp would match twice at the end, and thus insert a stray quote.
so use a discrete loop instead.
fixed the same thing in proparser/ioutils before ...
Task-number: QTCREATORBUG-4291
Kai Koehne [Tue, 26 Apr 2011 07:18:49 +0000 (09:18 +0200)]
QmlDebug: Make sure that right file is opened when hitting breakpoint
Make the file search case insensitive on Windows, in case the projects
directory has a different capitalization than what we store in the user
settings.
Reviewed-by: Robert Loehning
con [Mon, 11 Apr 2011 14:48:36 +0000 (16:48 +0200)]
Adapt to new config file location.
Robert Loehning [Thu, 21 Apr 2011 16:32:32 +0000 (18:32 +0200)]
Added missing translation
Reviewed-by: ossi
hjk [Thu, 21 Apr 2011 16:31:34 +0000 (18:31 +0200)]
bineditor: start making width flexible
hjk [Thu, 21 Apr 2011 15:41:17 +0000 (17:41 +0200)]
memoryview: save a few pixels
hjk [Thu, 21 Apr 2011 13:10:09 +0000 (15:10 +0200)]
debugger: also show log output for "full stack trace"
Mac is different...
hjk [Thu, 21 Apr 2011 13:01:48 +0000 (15:01 +0200)]
projectexplorer: fix style
Christian Kandeler [Thu, 21 Apr 2011 14:58:38 +0000 (16:58 +0200)]
Maemo: Introduce abstract base class for deploy steps targeting devices.
This will make it possible for a MaemoRunConfiguration to work
with deploy steps that do not use Utils::SshConnection, but still
want to make use of our device configurations.
Christian Kandeler [Thu, 21 Apr 2011 13:17:01 +0000 (15:17 +0200)]
Maemo: Make some public functions protected.
Tom Sutcliffe [Thu, 21 Apr 2011 13:59:05 +0000 (15:59 +0200)]
Added support for running QML debugger without C++ debugger on Symbian
Reviewed-by: kkoehne
Reviewed-by: Pawel Polanski
Friedemann Kleint [Thu, 21 Apr 2011 13:56:26 +0000 (15:56 +0200)]
Compile fix.
Friedemann Kleint [Thu, 21 Apr 2011 13:52:51 +0000 (15:52 +0200)]
Debugger: Separate internal constants.
Friedemann Kleint [Thu, 21 Apr 2011 13:34:19 +0000 (15:34 +0200)]
Debugger: Enable Stack Layout action in white area, too.
Friedemann Kleint [Thu, 21 Apr 2011 13:21:50 +0000 (15:21 +0200)]
CodePaster: Provide service for soft-dependent plugins.
Offer 'Paste' in VCSBase-Diff-Editor context menu.
Make new protocol the default one if user changes it
in view/paste dialogs.
Friedemann Kleint [Thu, 21 Apr 2011 13:08:27 +0000 (15:08 +0200)]
Compile fix.
Christian Kandeler [Thu, 21 Apr 2011 12:39:57 +0000 (14:39 +0200)]
Maemo: Move OsVersion type from MaemoGlobal to MaemoDeviceConfig.
Also move freePorts() method from AbstractMaemoDeployStep
to MaemoGlobal.
hjk [Thu, 21 Apr 2011 12:11:31 +0000 (14:11 +0200)]
debugger: somewhat more verbose explanation of "UseCodeModel"
Reviewed-by: con
hjk [Thu, 21 Apr 2011 12:02:26 +0000 (14:02 +0200)]
debugger: remove custom dumper location settings
Reviewed-by: con
Friedemann Kleint [Thu, 21 Apr 2011 12:36:04 +0000 (14:36 +0200)]
Project Welcome Page: Use correct file filter for projects.
Christian Kamm [Thu, 21 Apr 2011 12:19:47 +0000 (14:19 +0200)]
AutoCompleter: Avoid overzealously eating trailing }.
Task-number: QTCREATORBUG-4128
Reviewed-by: Leandro Melo
Christian Kandeler [Thu, 21 Apr 2011 12:03:38 +0000 (14:03 +0200)]
Maemo: Remove C++ dumper support.
They haven't been maintained for a while now, so no need to
try to support them.
Christian Kandeler [Thu, 21 Apr 2011 11:43:38 +0000 (13:43 +0200)]
Maemo: Remove outdated code.
This was left over from the time where there was only one kind
Target class for all Maemo-like target types.
Christian Kandeler [Thu, 21 Apr 2011 10:02:41 +0000 (12:02 +0200)]
Maemo: Fix file handling refactoring artifact.
Some content was written into the wrong files.
Friedemann Kleint [Thu, 21 Apr 2011 11:54:52 +0000 (13:54 +0200)]
Symbian: Fix error reporting.
Friedemann Kleint [Thu, 21 Apr 2011 11:39:40 +0000 (13:39 +0200)]
Debugger/Stack layout view: Exclude Dereferenced Pointers.
by WatchData::referencingAddress as they are outside
the address range.
Kai Koehne [Wed, 20 Apr 2011 13:52:44 +0000 (15:52 +0200)]
QmlDebug: Fix debugging for mixed projects on MinGW
We've so far missed the 'QDeclarativeDebug: ' messages, because they
were arriving on an unexpected channel.
Task-number: QTCREATORBUG-4630
Reviewed-by: Friedemann Kleint
Christian Kandeler [Thu, 21 Apr 2011 07:33:28 +0000 (09:33 +0200)]
Maemo: Disable QML debugging for Harmattan and Meego.
It's completely broken for the remote case in both pure QML and
mixed mode.
Friedemann Kleint [Thu, 21 Apr 2011 11:04:43 +0000 (13:04 +0200)]
Debugger: Improve register check for memory layout.
Christian Kamm [Thu, 21 Apr 2011 10:56:37 +0000 (12:56 +0200)]
QmlJS: Fix object literal indent in property initializers.
Friedemann Kleint [Thu, 21 Apr 2011 10:32:36 +0000 (12:32 +0200)]
Debugger: Add option to show the stack memory layout.
Show all variables. Mark registers as well in variable memory view
(showing stack pointers, etc).
Christiaan Janssen [Thu, 21 Apr 2011 10:25:06 +0000 (12:25 +0200)]
QmlDebugger: synchronize watches when deleted
Reviewed-by: Kai Koehne
Christian Kamm [Thu, 21 Apr 2011 10:21:23 +0000 (12:21 +0200)]
QmlJS: Fix indent of object literals.
Reviewed-by: Roberto Raggi
Christian Kamm [Thu, 21 Apr 2011 09:37:14 +0000 (11:37 +0200)]
Fix the qmljs indenter autotest.
Reviewed-by: Bill King
Oswald Buddenhagen [Thu, 21 Apr 2011 09:36:37 +0000 (11:36 +0200)]
use environment from build config also when starting external processes
this uses QProcessEnvironment directly, which is somewhat inefficient,
but it has no big impact, and it can be optimized on the qt side.
Task-number: QTCREATORBUG-2866
Oswald Buddenhagen [Wed, 20 Apr 2011 20:26:01 +0000 (22:26 +0200)]
use QProcess in profile evaluator if not bootstrapped
this avoids the nasty console popups under windows
Task-number: QTCREATORBUG-1788
Oswald Buddenhagen [Wed, 20 Apr 2011 20:26:25 +0000 (22:26 +0200)]
fix return statement in #if 0'd code
Christian Kamm [Thu, 21 Apr 2011 09:09:29 +0000 (11:09 +0200)]
QmlJS: Add semantic errors to task window.
Task-number: QTCREATORBUG-4103
Reviewed-by: Leandro Melo
Christian Kamm [Wed, 20 Apr 2011 08:46:04 +0000 (10:46 +0200)]
QmlJS: Fix library-by-path imports.
Fixes the problem
5426c3ac2cdf898ca1190a7746ba506ff24abc50 and
7b25f438c67c7cf395ccd2cd846e5d413f6d9222 worked around.
Reviewed-by: Erik Verbruggen
Christian Kandeler [Thu, 21 Apr 2011 09:10:47 +0000 (11:10 +0200)]
Maemo: Fix directory deployment issues.
Christian Kandeler [Thu, 21 Apr 2011 08:53:25 +0000 (10:53 +0200)]
Maemo: Fix issue with cached device configuration.
External functions need to access the real device config,
internal ones need the cached one during deployment.
Task-number: QTCREATORBUG-4514
Christian Kandeler [Thu, 21 Apr 2011 07:38:58 +0000 (09:38 +0200)]
Maemo: Make QML debugging engine aware of early inferior exit.
Christian Kandeler [Thu, 21 Apr 2011 07:37:52 +0000 (09:37 +0200)]
Maemo: Fix misleading error message.
Christian Kandeler [Wed, 20 Apr 2011 13:16:33 +0000 (15:16 +0200)]
struct -> class
Christian Kamm [Thu, 21 Apr 2011 07:43:24 +0000 (09:43 +0200)]
QmlJS: Don't warn about function exp statements.
Reviewed-by: Roberto Raggi
Friedemann Kleint [Thu, 21 Apr 2011 07:10:31 +0000 (09:10 +0200)]
Debugger: Fix up titles/tooltips of memory views.
Oswald Buddenhagen [Wed, 20 Apr 2011 19:16:17 +0000 (21:16 +0200)]
use environment from build configuration in the project evaluator
Task-number: QTCREATORBUG-2866
Oswald Buddenhagen [Wed, 20 Apr 2011 16:19:33 +0000 (18:19 +0200)]
eliminate m_filevaluemap by using source tagging
instead of having a second value map per included file, simply tag all
values with the project file they are coming from. a lot cleaner and
marginally faster.
Christiaan Janssen [Wed, 20 Apr 2011 14:47:47 +0000 (16:47 +0200)]
QmlDebugger: keeping watches when changing stack frames
Reviewed-by: Kai Koehne
Friedemann Kleint [Wed, 20 Apr 2011 15:02:21 +0000 (17:02 +0200)]
Bin editor: Improve tooltip.
Fix endianness.
Show binary, octal for single bytes, float and double.
Use HTML tables for formatting.
Leena Miettinen [Wed, 20 Apr 2011 14:20:18 +0000 (16:20 +0200)]
Doc: known issue related to Okteta KDE custom widget plugin
Task-number: QTCREATORBUG-4586
Reviewed-by: Friedemann Kleint