OSDN Git Service
Alessandro Portale [Fri, 29 Oct 2010 14:17:24 +0000 (16:17 +0200)]
Removing ToolBar and StatusBar from mobile app ui template
These are useseless place eaters. If needed, they can easily
be added by the user in Qt Designer.
Reviewed-By: ck
Christian Kandeler [Fri, 29 Oct 2010 14:19:56 +0000 (16:19 +0200)]
Maemo: Introduce states to debug support class.
Task-number: QTCREATORBUG-2705
Friedemann Kleint [Fri, 29 Oct 2010 13:36:49 +0000 (15:36 +0200)]
Friedemann Kleint [Fri, 29 Oct 2010 13:35:14 +0000 (15:35 +0200)]
Add helper to find out about Windows 32/64bit for Debuggers.
hjk [Fri, 29 Oct 2010 13:23:13 +0000 (15:23 +0200)]
hot fix to allow running projects again.
This disables Qt4Project::validParse() and needs to be reverted again
Reviewed-by: Tobias Hunger
hjk [Fri, 29 Oct 2010 13:19:05 +0000 (15:19 +0200)]
Revert "Qt4ProjectManager: correctly set parse state on restoring"
This reverts commit
b979d9f15189a2b73fd77b30ccb6652ec213bb55.
Friedemann Kleint [Fri, 29 Oct 2010 13:20:10 +0000 (15:20 +0200)]
TextEditor: Some exported header cleanup.
Remove internal markers from exported headers,
introduce private class for BaseTextDocument.
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Christian Kandeler [Fri, 29 Oct 2010 12:53:30 +0000 (14:53 +0200)]
Maemo: Fix typo in connect() call.
hjk [Thu, 28 Oct 2010 10:18:38 +0000 (12:18 +0200)]
debugger: refactor breakpoint type, add function name to resolved jsbreakpoints
Tobias Hunger [Fri, 29 Oct 2010 12:18:08 +0000 (14:18 +0200)]
Git: Fix stash names
Fix detection of stash names.
Task-number: QTCREATORBUG-2934
Tobias Hunger [Fri, 29 Oct 2010 12:13:44 +0000 (14:13 +0200)]
Git: Use class instead of struct
Christian Kandeler [Fri, 29 Oct 2010 12:04:23 +0000 (14:04 +0200)]
Debugger/Remote Debugging: Add "GNU target" start parameter.
This is needed for multi-architecture gdb.
Reviewed-by: hjk
Christian Kandeler [Fri, 29 Oct 2010 10:17:56 +0000 (12:17 +0200)]
Maemo: Introduce generic state checking.
Tobias Hunger [Fri, 29 Oct 2010 11:40:30 +0000 (13:40 +0200)]
Enable/disable RCconfig widgets in constructor
Tobias Hunger [Fri, 29 Oct 2010 10:51:14 +0000 (12:51 +0200)]
Small fixes
dt [Fri, 29 Oct 2010 10:16:30 +0000 (12:16 +0200)]
Qt4ProjectManager: correctly set parse state on restoring
dt [Fri, 29 Oct 2010 10:16:03 +0000 (12:16 +0200)]
Qt4ProjectManager: correctly Initialize parse State for Qt4RC
Arvid Ephraim Picciani [Fri, 29 Oct 2010 10:17:44 +0000 (12:17 +0200)]
one more dead header
dt [Fri, 29 Oct 2010 10:15:30 +0000 (12:15 +0200)]
Qt4ProjectManager: Fix crash
Arvid Ephraim Picciani [Fri, 29 Oct 2010 10:13:04 +0000 (12:13 +0200)]
Remove some unnessesary headers
Christian Kandeler [Fri, 29 Oct 2010 09:41:39 +0000 (11:41 +0200)]
Maemo: Improve clean-up behaviour on remote hosts.
We now remove files we have created on the device because they are
temporarily needed. This includes package files, mount points and pipes.
Task-number: QTCREATORBUG-2709
Arvid Ephraim Picciani [Mon, 25 Oct 2010 12:00:19 +0000 (14:00 +0200)]
Clean up BreakPoint
Reviewed-by: Friedemann Kleint
Reviewed-by: hjk
Kai Koehne [Thu, 21 Oct 2010 06:30:53 +0000 (08:30 +0200)]
QmlProject: Don't use RegExp for simple wildcard matching
QRegExp matching is quite expensive, and has to be done for every file
in the project directory tree against all possible suffixes. Optimize
for the common case that the pattern is "*.suffix" by doing a
fileName.endsWidth(suffix) in this case.
This speeds up loading of examples/declarative/declarative.qmlproject by
about 30%.
Reviewed-by: Christian Kamm
Kai Koehne [Wed, 20 Oct 2010 09:52:54 +0000 (11:52 +0200)]
QmlOutline: Speed up updates
Guard the incremental updates with beginResetModel/endResetModel
This gives better overall performance then passing the incremental
updates to the views.
Tested-by: Lasse Holmstedt
Takumi ASAKI [Thu, 28 Oct 2010 17:47:49 +0000 (19:47 +0200)]
Support UTF-8 BOM in TextEditor
TextEditor will now recognize an UTF-8 BOM.
A setting to determine what to do on saving has been added as well - the
options are "Always Add", "Keep Already Present" and (mostly for
completeness) "Always Delete".
Note: if encoding is "System", "Always Add" doesn't work, because there
is no API to know what the System encoding is.
Task-number: QTCREATORBUG-1857
Merge-request: 2180
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Oswald Buddenhagen [Thu, 28 Oct 2010 17:26:20 +0000 (19:26 +0200)]
move default encoding setting to text editor/behavior
Oswald Buddenhagen [Thu, 28 Oct 2010 14:20:16 +0000 (16:20 +0200)]
less bizarre title and tool tips for "storage" groupbox
dt [Thu, 28 Oct 2010 15:58:48 +0000 (17:58 +0200)]
Fix compile
dt [Wed, 27 Oct 2010 14:27:22 +0000 (16:27 +0200)]
Disable Run Configurations while parsing .pro files
Initial patch and idea by hunger.
Reviewed-By: hunger
Francois Ferrand [Thu, 28 Oct 2010 13:57:09 +0000 (15:57 +0200)]
Keep scrollbar at bottom of window while resizing, to ensure we keep
scrolling.
Allow Ctrl+Home/Ctrl+End to scroll to the beginning/end of buffer.
Merge-request: 202
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Christian Kandeler [Thu, 28 Oct 2010 13:03:03 +0000 (15:03 +0200)]
SSH: Add test for remote process execution.
Task-number: QTCREATORBUG-2706
Tobias Hunger [Thu, 28 Oct 2010 10:02:14 +0000 (12:02 +0200)]
SVN: Use codec when running svn diff
Task-number: QTCREATORBUG-2929
Francois Ferrand [Thu, 28 Oct 2010 10:13:47 +0000 (12:13 +0200)]
Support new keywords %MONTH% and %DAY% for C++ template file.
Merge-request: 199
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Christian Kandeler [Thu, 28 Oct 2010 07:22:19 +0000 (09:22 +0200)]
Maemo: Remove additional parsing step.
Instead, utilize the newly added INSTALLS information of Qt4ProFileNode.
Task-number: QTCREATORBUG-2679
hjk [Thu, 28 Oct 2010 06:55:50 +0000 (08:55 +0200)]
x
hjk [Wed, 27 Oct 2010 16:44:25 +0000 (18:44 +0200)]
debugger: pimpl JSDebuggerAgent
hjk [Wed, 27 Oct 2010 16:10:34 +0000 (18:10 +0200)]
debugger: don't display invalid line numbers in the stack view
hjk [Wed, 27 Oct 2010 16:03:11 +0000 (18:03 +0200)]
jsdebugger: add a dummy entry to arrays that have no real children
hjk [Wed, 27 Oct 2010 15:36:39 +0000 (17:36 +0200)]
jsdebugger: use a real structure for a stack frame in the debuggeragent
hjk [Wed, 27 Oct 2010 15:04:07 +0000 (17:04 +0200)]
jsdebugger: don't output function code. it's useless.
hjk [Wed, 27 Oct 2010 14:56:04 +0000 (16:56 +0200)]
jsdebugger: use QByteArray for data transfer
Easier to debug, less data to transfer.
Christian Kandeler [Wed, 27 Oct 2010 15:19:52 +0000 (17:19 +0200)]
Qt4ProFileNode: Make a project's INSTALLS settings available.
Task-number: QTCREATORBUG-2679
Reviewed-by: dt
Christian Kandeler [Wed, 27 Oct 2010 10:12:43 +0000 (12:12 +0200)]
Maemo: Prevent disconnecting null pointer.
Christian Kamm [Wed, 20 Oct 2010 11:50:52 +0000 (13:50 +0200)]
C++ editor: Fix 'follow symbol' to work on several core Qt macros.
Task-number: QTCREATORBUG-2240
Reviewed-by: Erik Verbruggen
Friedemann Kleint [Wed, 27 Oct 2010 14:27:12 +0000 (16:27 +0200)]
Debugger: Fix current line in assembly listing
Reviewed-by: con
Friedemann Kleint [Wed, 27 Oct 2010 13:39:42 +0000 (15:39 +0200)]
Debugger[gdb/Mac]: Show location marker in Mac OS disassembly.
Account for "0x0000000100002682sub $0x68,%rsp", convert
hex address correctly to match the location.
Reviewed-by: hjk
hjk [Wed, 27 Oct 2010 14:07:36 +0000 (16:07 +0200)]
debugger: show stack frame level in js debugger
hjk [Wed, 27 Oct 2010 13:39:25 +0000 (15:39 +0200)]
debugger: remove/update some cruft
hjk [Wed, 27 Oct 2010 13:23:30 +0000 (15:23 +0200)]
debugger: code cosmetics
hjk [Wed, 27 Oct 2010 13:05:56 +0000 (15:05 +0200)]
debugger: don't let slave engine command the gui
hjk [Wed, 27 Oct 2010 13:05:37 +0000 (15:05 +0200)]
debugger: renaming, part II
hjk [Wed, 27 Oct 2010 12:25:36 +0000 (14:25 +0200)]
debugger: rename m_runInWrapperEngine into m_isSlaveEngine
hjk [Wed, 27 Oct 2010 12:21:33 +0000 (14:21 +0200)]
debugger: prepare removal of plugin()->updateState(this);
hjk [Wed, 27 Oct 2010 12:10:44 +0000 (14:10 +0200)]
debugger: code cosmetics
con [Wed, 27 Oct 2010 10:51:33 +0000 (12:51 +0200)]
Fix replacement of variables in wizard parameters.
This was broken in case of no targets page being used, and using
the project name variable in default values for wizard parameters in the
page following the intro page (like it is done in the hello world
wizard).
Reviewed-by: Friedemann Kleint
Friedemann Kleint [Wed, 27 Oct 2010 09:05:31 +0000 (11:05 +0200)]
Merge remote branch 'origin/2.1'
Christian Kandeler [Wed, 27 Oct 2010 08:50:52 +0000 (10:50 +0200)]
Maemo: Have only one MaemoDeployables object per Maemo target.
It does not depend on any of the settings in the deploy configuration.
Task-number: QTCREATORBUG-2678
hjk [Tue, 26 Oct 2010 15:08:12 +0000 (17:08 +0200)]
Debugger [CDB]: Release COM interfaces on RunControl finished.
Ensure that at most one instance of the CDBEngine is alive.
Prevent inconsistent debugger states if several sessions are started.
Squashed cherry-picked commits from master correcting the
plugin state handling (
2efdeb5cd00ca012642d3b6944b04a04326c3f00,
57f7616286f4a98e3af2b6908211f47416270992).
Reviewed-by: hjk
Task-number: QTCREATORBUG-2894
dt [Tue, 26 Oct 2010 17:31:38 +0000 (19:31 +0200)]
ProjectExplorer: Switch Mode for files passed on command line.
hjk [Tue, 26 Oct 2010 15:08:12 +0000 (17:08 +0200)]
debugger: fix EngineSetupFailed path
Task-number: QTCREATORBUG-2837
hjk [Tue, 26 Oct 2010 14:49:29 +0000 (16:49 +0200)]
debugger: call shutdownEngine, not shutdownInferior on EngineRunFailed
Christian Kamm [Tue, 26 Oct 2010 14:29:46 +0000 (16:29 +0200)]
qmldump: Ensure path and environment are taken from the same Qt version.
Fixes
f1fb0bddb11d69355784953a6cc0364f9fa25d3e.
Reviewed-by: Kai Koehne
Friedemann Kleint [Tue, 26 Oct 2010 13:39:37 +0000 (15:39 +0200)]
Debugger/JS Code model: Set environment for QML tools correctly.
Set complete build environment (MinGW).
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Task-number: QTCREATORBUG-2883
Thomas Hartmann [Tue, 26 Oct 2010 13:29:04 +0000 (15:29 +0200)]
QmlDesigner.formEditor: fix memory leak
Reviewed-by: Marco Bubke
Thomas Hartmann [Tue, 26 Oct 2010 13:22:04 +0000 (15:22 +0200)]
QmlDesigner.rewriter: fixing memory leak
The destructor has to be virtual to avoid
a memory leak.
Reviewed-by: Roberto Raggi
hjk [Tue, 26 Oct 2010 13:11:34 +0000 (15:11 +0200)]
debugger: rename Dumper.putItem -> putSubItem, putItemHelper -> putItem
Roberto Raggi [Tue, 26 Oct 2010 11:50:17 +0000 (13:50 +0200)]
Updated the QML/JS front-end.
axasia [Tue, 26 Oct 2010 09:25:22 +0000 (11:25 +0200)]
Update Japanese 2.1 translations.
Merge-request: 207
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Sergey Belyashov [Tue, 26 Oct 2010 09:23:49 +0000 (11:23 +0200)]
Updated Russian translation
Merge-request: 208
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
hjk [Tue, 26 Oct 2010 09:08:49 +0000 (11:08 +0200)]
debugger: fix style after previous merge
Francois Ferrand [Tue, 26 Oct 2010 08:58:49 +0000 (10:58 +0200)]
Fit debugger tooltip to screen, showing/hiding scrollbars as needed
Merge-request: 203
Reviewed-by: hjk <qtc-committer@nokia.com>
Francois Ferrand [Tue, 26 Oct 2010 09:02:49 +0000 (11:02 +0200)]
Fix margin drawing when disabled code has a 'transparent' background
(default).
Merge-request: 201
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Martin Aumüller [Tue, 26 Oct 2010 08:56:32 +0000 (10:56 +0200)]
fakevim: don't swap cmd and ctrl keys on os x
qt reversed the mapping of cmd and ctrl internally, this should be re-reversed in vi
Merge-request: 190
Reviewed-by: hjk <qtc-committer@nokia.com>
Martin Aumüller [Tue, 26 Oct 2010 08:56:32 +0000 (10:56 +0200)]
fakevim: ':set noic'/':set ic' was inverted
QAction::trigger toggles the action, thus set inverse state before triggering
Merge-request: 190
Reviewed-by: hjk <qtc-committer@nokia.com>
Martin Aumüller [Tue, 26 Oct 2010 08:56:32 +0000 (10:56 +0200)]
fakevim: don't send ':set ic' and ':set noic' to handler in order to avoid warning about unsupported option
Merge-request: 190
Reviewed-by: hjk <qtc-committer@nokia.com>
Martin Aumüller [Tue, 26 Oct 2010 08:56:32 +0000 (10:56 +0200)]
fakevim: fixes for search using Core find dialog
- repeated searching ('n'/'N') would not work
- search would have been restricted to selection
- fix search when used as motion in an edit command ('c/...')
Merge-request: 190
Reviewed-by: hjk <qtc-committer@nokia.com>
hjk [Tue, 26 Oct 2010 08:40:31 +0000 (10:40 +0200)]
debugger: add python dumpers for __m128
hjk [Wed, 13 Oct 2010 08:14:42 +0000 (10:14 +0200)]
debugger: add manual test for default constructed QTextCursor
Oswald Buddenhagen [Mon, 25 Oct 2010 17:23:43 +0000 (19:23 +0200)]
remove execute bit ... again
Oswald Buddenhagen [Mon, 25 Oct 2010 17:20:12 +0000 (19:20 +0200)]
update list of up-to-date translations
Oswald Buddenhagen [Mon, 25 Oct 2010 15:52:23 +0000 (17:52 +0200)]
update german translation
Oswald Buddenhagen [Mon, 25 Oct 2010 17:03:50 +0000 (19:03 +0200)]
simplify #include statement
helps lupdate
Oswald Buddenhagen [Mon, 25 Oct 2010 15:51:27 +0000 (17:51 +0200)]
exclude dead/irrelevant sources from string collection
con [Mon, 25 Oct 2010 16:02:27 +0000 (18:02 +0200)]
Add a -settingspath <path> command line option.
Useful for testing.
Oswald Buddenhagen [Mon, 25 Oct 2010 15:50:56 +0000 (17:50 +0200)]
kill dead source string
dt [Mon, 25 Oct 2010 15:26:41 +0000 (17:26 +0200)]
Qt4ProjectManager: Add some safety code
Might, or might not fix
Task-Nr: QTCREATORBUG-2361
con [Mon, 25 Oct 2010 15:12:19 +0000 (17:12 +0200)]
Remove some stone old compat code + use methods for user resource path.
Reviewed-by: dt
con [Mon, 25 Oct 2010 14:57:58 +0000 (16:57 +0200)]
Get rid of hardcoded settingspaths that need to be synced.
Share the (user)settings object between plugin manager and Qt Creator
core.
con [Mon, 25 Oct 2010 14:56:15 +0000 (16:56 +0200)]
Saveguard against deletion.
con [Mon, 25 Oct 2010 11:37:46 +0000 (13:37 +0200)]
Don't close modified files or the current file at end of debug session
Acked-by: hjk
Sergey Belyashov [Mon, 25 Oct 2010 14:43:08 +0000 (16:43 +0200)]
Fixed double word in message
Adjusting the source in all affected translations as well.
Merge-request: 192
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Sergey Belyashov [Mon, 25 Oct 2010 13:47:14 +0000 (15:47 +0200)]
Updated Russian translation
Merge-request: 184
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Christian Kandeler [Mon, 25 Oct 2010 13:23:19 +0000 (15:23 +0200)]
Maemo: Implement on-demand adding of desktop files.
Task-number: QTCREATORBUG-2704
Friedemann Kleint [Mon, 25 Oct 2010 13:21:36 +0000 (15:21 +0200)]
Debugger: Suppress inconsistencies in gdb binary settings.
caused by the merging of global settings.
Terminate list of binaries by an empty element to prevent
accidental reading of consecutive keys.
Add Linux-ICC to list of toolchains for gdb.
Acked-by: hjk
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
Task-number: QTCREATORBUG-2848
axasia [Mon, 25 Oct 2010 13:14:29 +0000 (15:14 +0200)]
L10N: Update Japanese 2.1 translation.
Merge-request: 194
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Victor Ostashevsky [Mon, 25 Oct 2010 12:27:48 +0000 (14:27 +0200)]
Ukrainian translation updated
Merge-request: 205
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Kai Koehne [Mon, 25 Oct 2010 11:58:30 +0000 (13:58 +0200)]
DebugHelpers: Remove incorrect warning about qmldump requiring 4.7.1
qmldump works fine with 4.7.0 (as long as private headers are available).
Reviewed-by: ckamm
Kai Koehne [Mon, 25 Oct 2010 11:13:06 +0000 (13:13 +0200)]
DebugHelpers: Always update icons after recompile
The information about a Qt version (including the debugging helper paths)
is cached. Invalidate the cache after all the debugging helpers have
been built, such that the following icon updates actually get the latest
information.
We do invalidate the cache already before the compilation of
the debugging helpers have started, but QmlDumperTool::canBuild
then triggers a refill of the cache, at a time where the qmldump
executable has not yet been created.
Reviewed-by: Friedemann Kleint
Task-number: QTCREATORBUG-2807
dt [Mon, 25 Oct 2010 11:57:45 +0000 (13:57 +0200)]
Fix double listing of files
Reviewed-By: con
Task-Nr: QTCREATORBUG-2729
dt [Wed, 13 Oct 2010 13:33:51 +0000 (15:33 +0200)]
Qt4ProjectManager: Compress the folderChanged via a small timer
Reviewed-By: hunger