OSDN Git Service
Tobias Hunger [Thu, 14 Apr 2011 12:48:14 +0000 (14:48 +0200)]
ToolChain: Remove invalid toolchain when not needed
Remove the invalid toolchain from the combobox when it is no longer needed.
Tobias Hunger [Thu, 14 Apr 2011 08:50:28 +0000 (10:50 +0200)]
GCC: Move ABI in front of debugger again
In toolchain configuration widget: Move abi in front of debugger again
hjk [Thu, 14 Apr 2011 11:32:30 +0000 (13:32 +0200)]
projectexplorer: s/IPropertiesPanel/PropertiesPanel. No need for subclassing.
hjk [Thu, 14 Apr 2011 10:28:21 +0000 (12:28 +0200)]
core: make mode creation more uniform
dt [Thu, 14 Apr 2011 11:03:00 +0000 (13:03 +0200)]
TargetSetupPage: setBuildConfiguraionComboBoxVisible use the parameter
Instead of assuming that it is true. (Which is actually true, but well.)
Friedemann Kleint [Thu, 14 Apr 2011 10:58:14 +0000 (12:58 +0200)]
Documentation: Add ProjectExplorer plugin..
Reformat existing documentation to qdoc.
Oswald Buddenhagen [Thu, 14 Apr 2011 10:39:31 +0000 (12:39 +0200)]
Merge branch '2.2'
Conflicts:
src/plugins/debugger/gdb/pythongdbengine.cpp
src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp
src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.h
src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp
src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.h
src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
src/plugins/qt4projectmanager/qt4target.cpp
src/plugins/qt4projectmanager/qt4target.h
src/plugins/qt4projectmanager/qtoptionspage.h
src/plugins/qt4projectmanager/qtversionmanager.cpp
src/plugins/welcome/welcomemode.cpp
Jarek Kobus [Thu, 14 Apr 2011 10:07:39 +0000 (12:07 +0200)]
Remove unused constants, fix lacking virtual destructor
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
hjk [Thu, 14 Apr 2011 09:39:42 +0000 (11:39 +0200)]
welcomemode: disable accidentally enabled debug output
hjk [Thu, 14 Apr 2011 09:21:32 +0000 (11:21 +0200)]
code style
hjk [Thu, 14 Apr 2011 09:14:21 +0000 (11:14 +0200)]
coding style: prefer 'class' over 'struct' for consistency reasons
hjk [Wed, 13 Apr 2011 15:19:55 +0000 (17:19 +0200)]
welcome: simplify plugin code
hjk [Wed, 13 Apr 2011 15:09:44 +0000 (17:09 +0200)]
welcomemode: simplify WelcomeMode
hjk [Wed, 13 Apr 2011 14:09:04 +0000 (16:09 +0200)]
mode: make displayname, icon, priority, id, type data members
hjk [Wed, 13 Apr 2011 12:34:24 +0000 (14:34 +0200)]
icontext: remove BaseContext class
hjk [Wed, 13 Apr 2011 11:00:30 +0000 (13:00 +0200)]
core: make context and widget IContext data members
Christiaan Janssen [Wed, 13 Apr 2011 08:39:47 +0000 (10:39 +0200)]
QmlProfiler: qmlproject support
Reviewed-by: Kai Koehne
Leena Miettinen [Thu, 14 Apr 2011 07:51:18 +0000 (09:51 +0200)]
Doc: update screenshots
Gridlines were removed from several dialogs.
Leena Miettinen [Wed, 13 Apr 2011 13:25:44 +0000 (15:25 +0200)]
Doc: update breakpoint list
Leena Miettinen [Wed, 13 Apr 2011 13:02:27 +0000 (15:02 +0200)]
Doc: shadow building is not supported for Maemo on Windows
Reviewed-by: Christian Kandeler
Oswald Buddenhagen [Wed, 13 Apr 2011 19:29:26 +0000 (21:29 +0200)]
remove dead files
Oswald Buddenhagen [Wed, 13 Apr 2011 19:25:41 +0000 (21:25 +0200)]
de-duplicate resource list
Oswald Buddenhagen [Wed, 13 Apr 2011 19:20:13 +0000 (21:20 +0200)]
synchronize resources with their usage
toolbutton is not used, while formeditorstylesheet and outputpane-style
are used but were not actually linked.
Sergey Belyashov [Wed, 13 Apr 2011 16:09:40 +0000 (18:09 +0200)]
Updated Russian translation
Merge-request: 2190
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
hjk [Wed, 13 Apr 2011 16:00:15 +0000 (18:00 +0200)]
fix script executable flags after license header changes
Tobias Hunger [Wed, 13 Apr 2011 14:03:27 +0000 (16:03 +0200)]
Symbian: Always export SBS_HOME when building with SBSv2
Always export SBS_HOME when building with SBSv2, even though that
is no longer required. Not doing so breaks Qt 4.6.3 support in the
SDK for some people.
Task-number: QTCREATORBUG-4487
Reviewed-by: Robert Loehning
Christian Kandeler [Wed, 13 Apr 2011 14:23:34 +0000 (16:23 +0200)]
Maemo: Fix Qemu button state.
Took inactive targets into account.
Christian Kandeler [Wed, 13 Apr 2011 14:06:22 +0000 (16:06 +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
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.
Tobias Hunger [Tue, 12 Apr 2011 08:53:42 +0000 (10:53 +0200)]
ToolChain: Update projectsmode on tool chain changes
Update the projects mode on tool chain changes.
Task-number: QTCREATORBUG-4431
Kai Koehne [Wed, 13 Apr 2011 11:00:06 +0000 (13:00 +0200)]
QmlProject: Fix import of .qmlproject.user files from 2.1
We changed the semantics of an empty 'mainScript' in the .user file:
In 2.1 it translated to 'use current file', while in 2.2 the default is now
to use the file specified in .qmlproject.
However, if there is no mainFile specified in .qmlproject we should
fall back to the current file in editor.
Reviewed-by: Christiaan Janssen
Christian Kandeler [Wed, 13 Apr 2011 13:10:46 +0000 (15:10 +0200)]
Maemo: Use ABI for determining the gdb architecture string.
Can't use MADDE, because it is outdated.
Reviewed-by: Tobias Hunger
Task-number: QTCREATORBUG-4299
Christian Kandeler [Wed, 13 Apr 2011 13:09:47 +0000 (15:09 +0200)]
Maemo: Don't use "new" MADDE features.
The MADDE in the SDK is six months old...
Jarek Kobus [Wed, 13 Apr 2011 13:13:37 +0000 (15:13 +0200)]
Fix Polish punctuation
Friedemann Kleint [Wed, 13 Apr 2011 12:31:39 +0000 (14:31 +0200)]
Debugger[CDB]: Fix disassembler for lines with no offset.
Also add function lines as comment.
Fix offset display.
Friedemann Kleint [Wed, 13 Apr 2011 11:52:03 +0000 (13:52 +0200)]
Debugger[CDB]: Use new disassembler structures.
Parse CDB's ASM output, set it up with source line.
Move convenience to add source lines into DisassemblerLines
(cached).
Jarek Kobus [Wed, 13 Apr 2011 11:54:15 +0000 (13:54 +0200)]
Add "Add Library" action to project explorer's context menu
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Task-number: QTCREATORBUG-4127
dt [Wed, 13 Apr 2011 11:12:02 +0000 (13:12 +0200)]
Qt4RunConfiguration: Hide the run in console checkbox for simulator
Reviewed-By: hunger
dt [Wed, 13 Apr 2011 11:10:30 +0000 (13:10 +0200)]
CMakeProject: Fix wrong slots
We never noticed that we had run cmake
Reviewed-By: hunger
dt [Wed, 13 Apr 2011 10:01:54 +0000 (12:01 +0200)]
Fix available toolchains for cmake and generic project manager
Reviewed-By: hunger
dt [Tue, 12 Apr 2011 17:05:32 +0000 (19:05 +0200)]
Fix available QtVersion::availableToolchains
Do really disable the symbian emulator if there's no toolchain
supporting it.
Reviewed-By: hunger
dt [Tue, 12 Apr 2011 16:51:55 +0000 (18:51 +0200)]
Fix toolchain restricted to targets handling
Reviewed-By: hunger
Jarek Kobus [Wed, 13 Apr 2011 11:11:09 +0000 (13:11 +0200)]
Update Polish translations
Friedemann Kleint [Wed, 13 Apr 2011 10:56:42 +0000 (12:56 +0200)]
Debugger[CDB]: Fix assembly mode stepping.
Snapped back to source mode as the pending variable was not set.
Reviewed-by: hjk
hjk [Wed, 13 Apr 2011 06:42:33 +0000 (08:42 +0200)]
Update license.
Tobias Hunger [Wed, 13 Apr 2011 09:25:23 +0000 (11:25 +0200)]
Maemo: Use debugger set up by the SDK
Use the debugger set up by the Qt SDK instead of the one shipped
with Maemo/Meego.
Task-number: QTCREATORBUG-4299
Reviewed-by: Christian Kandeler
Kai Koehne [Wed, 13 Apr 2011 08:29:12 +0000 (10:29 +0200)]
QmlJS: Don't force -O3 in debug mode
Makes debugging the QMLJS lib a pain :)
dt [Wed, 13 Apr 2011 08:12:52 +0000 (10:12 +0200)]
Fix qt version number in Qt Quick Wizard
Temporal lapse in understanding which qt version is required for the Qt
Quick Wizard. On Maemo we have the Qt Quick compat plugin which allows
the generated project to work with 4.7.0. In theory that doesn't apply
to symbian, but qt 4.7.0 does not support symbian. (And on the desktop
everyone has upgraded.)
Reviewed-By: ck
Friedemann Kleint [Wed, 13 Apr 2011 06:50:43 +0000 (08:50 +0200)]
Fix compiler warnings.
hjk [Tue, 12 Apr 2011 15:47:53 +0000 (17:47 +0200)]
itexteditor: remove a few unneeded empty destructors
dt [Tue, 12 Apr 2011 17:42:25 +0000 (19:42 +0200)]
Fixing tons of application output
Master fixed a bug where a newline was almost always prepended to any
output. As a side effect of that a lot of messages which outputed no
newline broke. This commit fixes the obvious ones, probably missing a
few.
Marco Bubke [Tue, 12 Apr 2011 17:16:25 +0000 (19:16 +0200)]
QmlDesigner.NodeInstances: Use dummy data for components too
Reviewed-By: Thomas Hartmann
dt [Tue, 12 Apr 2011 15:41:25 +0000 (17:41 +0200)]
TargetSetupPage: Disable editing build directory for symbian
Shadow building is not supported so editing the path has no purpose.
Reviewed-By: hunger
dt [Tue, 12 Apr 2011 14:29:02 +0000 (16:29 +0200)]
Fix minimum qt version for mobile/html wizard
That was broken by the TargetSetupPage refactoring
Task-Nr: QTCREATORBUG-4486
Reviewed-By: ck
hjk [Tue, 12 Apr 2011 15:32:41 +0000 (17:32 +0200)]
debugger: re-work DisassemblerLine structure
Thomas Hartmann [Tue, 12 Apr 2011 14:38:54 +0000 (16:38 +0200)]
QmlDesigner.meegoplugin: updating icons for Meego
Thomas Hartmann [Tue, 12 Apr 2011 14:05:41 +0000 (16:05 +0200)]
QmlDesigner.propertyEditor: bugfix for Rectangle.radius
Task-number: QTCREATORBUG-4285
Reviewed-by: Marco Bubke
Daniel Molkentin [Tue, 12 Apr 2011 14:35:50 +0000 (16:35 +0200)]
Prevent improper sizing of MiniProjectTargetSelector
The selector would sometimes be too high (if projects were removed),
and sometimes show vertical scrollbars (if projects were added). This
problem was limited to the first time that the widget was opened on
all platforms but on OS X, where it could be observed persistently
and where its lack potentially can cause problems due to
ed5d10a.
Reviewed-by: con
Task-Number: QTCREATORBUG-1792
Pawel Polanski [Tue, 12 Apr 2011 14:38:58 +0000 (16:38 +0200)]
Symbian: fix in the Debugger's output texts
con [Tue, 12 Apr 2011 10:56:09 +0000 (12:56 +0200)]
Fix expanding details button.
Task-number: QTCREATORBUG-4467
Reviewed-by: Robert Loehning
Tom Sutcliffe [Wed, 23 Mar 2011 16:02:22 +0000 (16:02 +0000)]
Fixes for QML debugging over USB OST
Tom Sutcliffe [Wed, 23 Feb 2011 11:10:51 +0000 (12:10 +0100)]
Added some support for QML debugging over USB. Fixed some issues with -qmljsdebugger option.
Not fully working over USB yet, there are some handshaking issues that need to be addressed. WLAN might be improved due to the -qmljsdebugger fixes, but not tested.
Kai Koehne [Mon, 14 Feb 2011 12:37:56 +0000 (13:37 +0100)]
Symbian: Move QMLJSDEBUGGER qmake argument
Make sure it's before the "-after" section, and therefore available in the .pro file.
Kai Koehne [Mon, 14 Feb 2011 12:36:39 +0000 (13:36 +0100)]
Symbian: Show debugger language chooser in run settings
dt [Tue, 12 Apr 2011 14:21:18 +0000 (16:21 +0200)]
Actually compile
That's what you get for applying the patch, testing it and then applying
it again.
Friedemann Kleint [Tue, 12 Apr 2011 14:17:19 +0000 (16:17 +0200)]
Debugger: Add action to copy watch value to clipboard.
dt [Tue, 12 Apr 2011 14:01:46 +0000 (16:01 +0200)]
Fix deploy configuration for symbian
Reviewed-By: hunger
Pathch-By: ppolanski
Friedemann Kleint [Tue, 12 Apr 2011 13:56:03 +0000 (15:56 +0200)]
Debugger: Have Python dumper print type size information.
For memory views. In the dumper, create a cache of TypeInfo
structs to contain type information and print the new entries
in each call of bb().
Collect the information in the gdb engine.
Replace WatchData::origAddress by WatchData::ReferencingAddress
to be able to correctly handle automatically dereferenced
pointers of the gdb engine. Whereas 'address' of a automatically
dereferenced used to be that of the pointer, it is now that
of the dereferenced item matching the size reported, enabling
memory views. Referencing address is now the address of the pointer.
Reviewed-by: hjk
Leena Miettinen [Tue, 12 Apr 2011 13:51:13 +0000 (15:51 +0200)]
Doc: pinning tooltips in Debug mode
Reviewed-by: Friedemann Kleint
Friedemann Kleint [Tue, 12 Apr 2011 13:43:00 +0000 (15:43 +0200)]
Debugger/MemoryView: Recurse over children.
Color all available children if available instead of just
first order children. Remove member variable struct and
pass range vector representing area directly to recursion.
Friedemann Kleint [Tue, 12 Apr 2011 12:21:36 +0000 (14:21 +0200)]
Debugger: Fix memory view address display.
Jarek Kobus [Tue, 12 Apr 2011 11:11:15 +0000 (13:11 +0200)]
Remove unused constants
Reviewed-by: Tobias Hunger
hjk [Tue, 12 Apr 2011 10:17:19 +0000 (12:17 +0200)]
projectexplorer: move project{Context,Language} from IProjectManager to Project
Reviewed-by: dt
hjk [Tue, 12 Apr 2011 06:29:42 +0000 (08:29 +0200)]
genericproject: pass an essentially temporary variable as parameter
hjk [Tue, 12 Apr 2011 06:20:54 +0000 (08:20 +0200)]
genericproject: cosmetics
Friedemann Kleint [Tue, 12 Apr 2011 09:57:57 +0000 (11:57 +0200)]
Debugger[CDB]: Fix handling of shadowed variables.
Fix name formatting and algorithm to find uninitialized
variables to use reverse order in case locals of the same
name occur in a scope.
Reviewed-by: hjk
Task-number: QTCREATORBUG-4475
Friedemann Kleint [Tue, 12 Apr 2011 09:33:41 +0000 (11:33 +0200)]
L10n: Fix broken link in welcome page (tips).
Task-number: QTCREATORBUG-4481
Kai Koehne [Tue, 12 Apr 2011 08:49:47 +0000 (10:49 +0200)]
Revert "QmlJSEditor: Don't warn about failing dumps if dumper is from 2.1"
This reverts commit
d40c15abea817cf8c3e6b155a3faff7af527bbd3.
Was superseded by
284b0827 (QmlJS: Don't warn user about imports if static info is available).
Kai Koehne [Tue, 12 Apr 2011 07:14:31 +0000 (09:14 +0200)]
QmlJS: Don't warn user about imports if static info is available
Don't underline the import if a qmldump fails,
but the typeinfo is available via a .qmltypes file. That should allow
users to 'fix' qmldump issues by shipping a .qmltypes file.
Reviewed-by: Erik Verbruggen
Thomas Hartmann [Tue, 12 Apr 2011 08:30:45 +0000 (10:30 +0200)]
QmlDesigner.symbianPlugin: fix typo
Christian Kandeler [Tue, 12 Apr 2011 08:04:07 +0000 (10:04 +0200)]
Maemo: Add direct SFTP deployment method.
Not used yet.
Christian Kandeler [Tue, 12 Apr 2011 07:19:54 +0000 (09:19 +0200)]
Maemo: Fix compilation.
Christian Kandeler [Tue, 12 Apr 2011 06:15:18 +0000 (08:15 +0200)]
Maemo: Get rid of some Q_ASSERTs that limit forward compatibility.
Christian Kandeler [Tue, 12 Apr 2011 06:00:34 +0000 (08:00 +0200)]
Maemo: Fix deployment issues with disabled packaging.
hjk [Fri, 8 Apr 2011 13:38:50 +0000 (15:38 +0200)]
debugger: cleanup
hjk [Fri, 8 Apr 2011 13:24:23 +0000 (15:24 +0200)]
debugger: move not-so-generic stuff to gdb/classicgdbengine.cpp
hjk [Fri, 8 Apr 2011 13:00:26 +0000 (15:00 +0200)]
debugger: remove dead code
hjk [Fri, 8 Apr 2011 12:48:43 +0000 (14:48 +0200)]
debugger: use the new enum
Christiaan Janssen [Mon, 11 Apr 2011 15:07:17 +0000 (17:07 +0200)]
QmlDebugger: removed prefix in expression for locals
Task-number: QTCREATORBUG-4462
Reviewed-by: Kai Koehne
Robert Loehning [Mon, 11 Apr 2011 15:10:13 +0000 (17:10 +0200)]
Fix crash when closing QML files
Reviewed-by: Thomas Hartmann
Task-number: QTCREATORBUG-4459
Jarek Kobus [Mon, 11 Apr 2011 15:03:48 +0000 (17:03 +0200)]
Polish Polish translations
Leena Miettinen [Mon, 11 Apr 2011 14:57:02 +0000 (16:57 +0200)]
Doc: connecting to CODA over WLAN
Reviewed-by: Pawel Polanski
Leena Miettinen [Mon, 11 Apr 2011 14:56:14 +0000 (16:56 +0200)]
Doc: bring back a topic that disappeared mysteriously
Kai Koehne [Mon, 11 Apr 2011 14:31:11 +0000 (16:31 +0200)]
QmlDebug: Fix crash on Mac OS X
Work-around for what seems to be an optimization bug in
i686-apple-darwin9-gcc-4.2.1 . Without it, for i = 1
i - 1 != 0 .
Task-number: QTCREATORBUG-4107
Reviewed-by: hjk
Jarek Kobus [Mon, 11 Apr 2011 14:22:53 +0000 (16:22 +0200)]
Make "Macro" options title translatable
hjk [Mon, 11 Apr 2011 13:53:53 +0000 (15:53 +0200)]
debugger: fix disassembler address display on Mac
Reviewed-by: con
Pawel Polanski [Mon, 11 Apr 2011 13:43:39 +0000 (15:43 +0200)]
Typo fixed
Thomas Hartmann [Mon, 11 Apr 2011 13:43:11 +0000 (15:43 +0200)]
QmlDesigner: update for symbian plugin
Thomas Hartmann [Mon, 11 Apr 2011 13:40:14 +0000 (15:40 +0200)]
QmlDesigner.metaInfo: Pure cpp types have now the namespace <cpp>
Reviewed-by: Marco Bubke
Tobias Hunger [Mon, 11 Apr 2011 13:21:38 +0000 (15:21 +0200)]
Qt: Fix update of debugging helper display
Fix update of Qt debugging helper display (yet again;-)
Task-number: QTCREATORBUG-2810