OSDN Git Service
Friedemann Kleint [Thu, 4 Nov 2010 10:46:16 +0000 (11:46 +0100)]
Debugger: Add Run to/Jump to Line to text editor context menu.
Remove actions from debugger plugin as they are not directly usable.
Create additional actions in context menu.
Move some code around to find the current editor.
hjk [Thu, 4 Nov 2010 10:27:23 +0000 (11:27 +0100)]
debugger: re-enable functions and cleanup after breakhandler move
Christian Kandeler [Thu, 4 Nov 2010 09:23:48 +0000 (10:23 +0100)]
Debugging: Add explicit states to RemoteGdbProcess.
Task-number: QTCREATORBUG-2705
Friedemann Kleint [Thu, 4 Nov 2010 09:15:36 +0000 (10:15 +0100)]
Debugger: Fix enumeration slot warning.
Do not pass around flags QFlags by const-reference.
hjk [Thu, 4 Nov 2010 08:54:23 +0000 (09:54 +0100)]
debugger: move logical ownership of breakhandler from engines to plugin
hjk [Wed, 3 Nov 2010 13:59:28 +0000 (14:59 +0100)]
fakevim: restore "cheap build" capability of the manual "test"
Oswald Buddenhagen [Thu, 4 Nov 2010 08:20:46 +0000 (09:20 +0100)]
don't add core plugin include path 100 times
Bill King [Thu, 4 Nov 2010 00:06:06 +0000 (10:06 +1000)]
tests: fixes compile
Oswald Buddenhagen [Mon, 1 Nov 2010 17:51:20 +0000 (18:51 +0100)]
dynamically replace creator version during build
... instead of running a sed script over a lot of files on each
version increment.
Oswald Buddenhagen [Mon, 1 Nov 2010 17:02:26 +0000 (18:02 +0100)]
centralize addition of pluginspecs to OTHER_FILES
Oswald Buddenhagen [Thu, 14 Oct 2010 16:09:16 +0000 (18:09 +0200)]
make shellQuote() nicer
- unify unix and windows paths
- on windows:
- we don't need to care for trailing backslashes, as we never append
directly to quoted strings
- simplify, as this doesn't need to be fast.
unfortunately, it's impossible to use
ret.replace(QRegExp(QLatin1String("(\\\\*)$")), QLatin1String("\"\\1"));
as that matches foo\ twice (once one backslash and once an empty
string).
Christian Kandeler [Wed, 3 Nov 2010 16:11:56 +0000 (17:11 +0100)]
Maemo: Introduce explicit states to deploy step.
Probably fixed some subtle error handling bugs along the way.
Task-number: QTCREATORBUG-2705
Christian Kandeler [Wed, 3 Nov 2010 15:41:32 +0000 (16:41 +0100)]
SSH: Ignore incoming data after requesting to close an SFTP channel.
Friedemann Kleint [Wed, 3 Nov 2010 14:24:02 +0000 (15:24 +0100)]
Debugger[CDB]: Add register manipulation and 'Jump to line'.
Task-number: QTCREATORBUG-2975
Friedemann Kleint [Wed, 3 Nov 2010 12:37:01 +0000 (13:37 +0100)]
Debugger: Improve gdb binary settings handling.
- Remove non-executable entries on reading (check only
absolute paths since path search is too expensive).
- Make sure gdb binary settings are not written out unless the
user really changes them.
Reviewed-by: aep <arvid.picciani@nokia.com>
Acked-By: hjk
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
Tobias Hunger [Sat, 30 Oct 2010 19:58:28 +0000 (21:58 +0200)]
Fix spelling in dissassemble method
Krazy was complaining about this.
Reviewed-by: Friedemann Kleint
Tobias Hunger [Sat, 30 Oct 2010 19:54:23 +0000 (21:54 +0200)]
Fix spelling in comments
Krazy was complaining about those.
Tobias Hunger [Sat, 30 Oct 2010 19:17:35 +0000 (21:17 +0200)]
Add Q_OBJECT macros
Krazy complained about missing Q_OBJECT macros. Fix them.
Tobias Hunger [Sat, 30 Oct 2010 19:13:16 +0000 (21:13 +0200)]
Make operators == const
Krazy complained about those.
Tobias Hunger [Fri, 22 Oct 2010 17:40:41 +0000 (19:40 +0200)]
Add script to convert krazy output into a tasks file
Roman Kovalev [Wed, 3 Nov 2010 09:20:49 +0000 (10:20 +0100)]
svn: subversion log codec
Subversion stores log in UTF-8 and returns it back in user system locale.
So we do not need to encode it.
Merge-request: 213
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
con [Wed, 3 Nov 2010 10:37:04 +0000 (11:37 +0100)]
Support \n for regexp replace string.
Friedemann Kleint [Wed, 3 Nov 2010 09:03:48 +0000 (10:03 +0100)]
Qt4ProjectManager/Symbian: Header cleanup.
Friedemann Kleint [Wed, 3 Nov 2010 08:17:02 +0000 (09:17 +0100)]
Qt4ProjectManager: Compile on Non-windows.
Friedemann Kleint [Wed, 3 Nov 2010 08:05:14 +0000 (09:05 +0100)]
Qt4ProjectManager: Do not include windows.h in qtversionmanager.
Move 64bit-binary detection into Utils library.
hjk [Tue, 2 Nov 2010 17:59:03 +0000 (18:59 +0100)]
qtpromaker: add the ability to create a .pro for a binary's sources using gdb
hjk [Tue, 2 Nov 2010 16:51:25 +0000 (17:51 +0100)]
qtpromaker: create SUBDIRS .pro files up to a given level
con [Tue, 2 Nov 2010 16:20:09 +0000 (17:20 +0100)]
Update Mac requirements info.
Friedemann Kleint [Tue, 2 Nov 2010 15:53:56 +0000 (16:53 +0100)]
Coreplugin: Header cleanup.
Clean icore.h.
dt [Tue, 2 Nov 2010 15:40:31 +0000 (16:40 +0100)]
Qt4ProjectManager: Remove left over debugging output
dt [Tue, 2 Nov 2010 15:39:45 +0000 (16:39 +0100)]
Qt4ProjectManager: Emit correct state once on restoring
dt [Tue, 2 Nov 2010 11:27:12 +0000 (12:27 +0100)]
Revert "hot fix to allow running projects again."
This reverts commit
0d6601e424d61b94de7f34fe68cb340c7384f557.
dt [Tue, 2 Nov 2010 11:26:55 +0000 (12:26 +0100)]
Revert "Revert "Qt4ProjectManager: correctly set parse state on restoring""
This reverts commit
ae6dbf364ba6aa7e407d4b29073346a34097b865.
Christian Kandeler [Tue, 2 Nov 2010 15:15:56 +0000 (16:15 +0100)]
Maemo: By default, strip release binaries.
But never strip debug binaries.
Task-number: QTCREATORBUG-2981
Friedemann Kleint [Tue, 2 Nov 2010 15:14:00 +0000 (16:14 +0100)]
ProjectExplor/Debugger: Header cleanup
Christian Kandeler [Tue, 2 Nov 2010 14:08:30 +0000 (15:08 +0100)]
Maemo: Remove remaining barriers for concurrent debugging.
Pipes and mount points for debugging with on-device gdb now have
unique names.
Also give mount point for deploying via UTFS per-project file name.
Task-number: QTCREATORBUG-2702
Christian Kandeler [Tue, 2 Nov 2010 13:26:47 +0000 (14:26 +0100)]
Maemo: Remove some outdated TODOs.
Christian Kandeler [Tue, 2 Nov 2010 13:26:24 +0000 (14:26 +0100)]
Maemo: Re-enable package installation via UTFS mount.
Christian Kandeler [Tue, 2 Nov 2010 13:18:12 +0000 (14:18 +0100)]
Maemo: Add ports gatherer to deploy step.
Christian Kandeler [Tue, 2 Nov 2010 09:24:50 +0000 (10:24 +0100)]
Maemo: Use dynamic port list.
Check whether the ports we need are actually available on the device.
As a side effect, this makes it possible to debug more than one
application at the same time on Maemo.
Task-number: QTCREATORBUG-2702
mae [Tue, 2 Nov 2010 12:47:45 +0000 (13:47 +0100)]
Fix painting order
text on top of seach results on top of find scope on
top of ifdefed out lines.
hjk [Tue, 2 Nov 2010 12:36:14 +0000 (13:36 +0100)]
qtpromaker: refactoring
con [Tue, 2 Nov 2010 12:41:03 +0000 (13:41 +0100)]
Fixes restoration of main window geometry.
We were handling it ourselves, now we let saveGeometry and saveState do
its job. This also takes care of making the geometry valid for offscreen
saved states.
Task-number: QTCREATORBUG-1689
Robert Loehning [Tue, 2 Nov 2010 12:11:39 +0000 (13:11 +0100)]
Compile fix
Reviewed-by: hjk
Arvid Ephraim Picciani [Tue, 2 Nov 2010 11:37:36 +0000 (12:37 +0100)]
fakevim: Fix cursor movement in insert mode on Mac.
Reviewed-by: hjk
con [Tue, 2 Nov 2010 10:34:57 +0000 (11:34 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:creator/mainline
con [Tue, 2 Nov 2010 10:34:27 +0000 (11:34 +0100)]
Merge remote branch 'origin/2.1'
Conflicts:
README
doc/qt-html-templates.qdocconf
doc/qtcreator.qdoc
doc/qtcreator.qdocconf
share/qtcreator/templates/wizards/qtcreatorplugin/MyPlugin.pluginspec
src/app/Info.plist
src/plugins/bineditor/BinEditor.pluginspec
src/plugins/bookmarks/Bookmarks.pluginspec
src/plugins/classview/ClassView.pluginspec
src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec
src/plugins/coreplugin/Core.pluginspec
src/plugins/coreplugin/coreconstants.h
src/plugins/cpaster/CodePaster.pluginspec
src/plugins/cppeditor/CppEditor.pluginspec
src/plugins/cpptools/CppTools.pluginspec
src/plugins/cvs/CVS.pluginspec
src/plugins/debugger/Debugger.pluginspec
src/plugins/designer/Designer.pluginspec
src/plugins/fakevim/FakeVim.pluginspec
src/plugins/find/Find.pluginspec
src/plugins/genericprojectmanager/GenericProjectManager.pluginspec
src/plugins/git/ScmGit.pluginspec
src/plugins/helloworld/HelloWorld.pluginspec
src/plugins/help/Help.pluginspec
src/plugins/imageviewer/ImageViewer.pluginspec
src/plugins/locator/Locator.pluginspec
src/plugins/mercurial/Mercurial.pluginspec
src/plugins/perforce/Perforce.pluginspec
src/plugins/projectexplorer/ProjectExplorer.pluginspec
src/plugins/qmldesigner/QmlDesigner.pluginspec
src/plugins/qmljseditor/QmlJSEditor.pluginspec
src/plugins/qmljsinspector/QmlJSInspector.pluginspec
src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
src/plugins/regexp/RegExp.pluginspec
src/plugins/resourceeditor/ResourceEditor.pluginspec
src/plugins/snippets/Snippets.pluginspec
src/plugins/subversion/Subversion.pluginspec
src/plugins/tasklist/TaskList.pluginspec
src/plugins/texteditor/TextEditor.pluginspec
src/plugins/vcsbase/VCSBase.pluginspec
src/plugins/welcome/Welcome.pluginspec
Friedemann Kleint [Tue, 2 Nov 2010 10:33:22 +0000 (11:33 +0100)]
Debugger: Make manual CCDB test compile again.
Thomas Hartmann [Tue, 2 Nov 2010 10:17:59 +0000 (11:17 +0100)]
QmlDesigner: fixes crash
Deleting an items might have a side effect that turns
the qml code invalid. (e. g. alias properties)
We catch this an show a proper error message.
Task-number: QTCREATORBUG-2973
Reviewed-by: Kai Koehne
con [Tue, 2 Nov 2010 10:15:12 +0000 (11:15 +0100)]
Version bump.
con [Tue, 2 Nov 2010 10:14:03 +0000 (11:14 +0100)]
Merge remote branch 'origin/2.1'
con [Mon, 1 Nov 2010 16:39:28 +0000 (17:39 +0100)]
Add auto test for file search.
Friedemann Kleint [Tue, 2 Nov 2010 10:10:27 +0000 (11:10 +0100)]
Exported Header cleanup: QmlJSEditor
Move internal classes QmlJSEditorEditable/SemanticHighlighter
out of qmljseditor.h. Move QmlJSEditor from namespace
QmlJSEditor::Internal to QmlJSEditor.
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
con [Tue, 2 Nov 2010 10:10:09 +0000 (11:10 +0100)]
Merge remote branch 'origin/2.1.0' into 2.1
hjk [Tue, 2 Nov 2010 09:59:52 +0000 (10:59 +0100)]
debugger: work around gdb 7.2 quirk in QFlag dumper
Reviewed-By: Friedemann Kleint
hjk [Mon, 1 Nov 2010 18:10:44 +0000 (19:10 +0100)]
debugger: make QFile and QFileInfo visible without top-level inferior call
Reviewed-by: Oswald Buddenhagen
hjk [Mon, 1 Nov 2010 17:39:35 +0000 (18:39 +0100)]
debugger: fix dumping of reference targets
Reviewed-by: Alessandro Portale
Alessandro Portale [Mon, 1 Nov 2010 18:25:19 +0000 (19:25 +0100)]
Remove compile warning on Symbian.
Reviewed-By: TrustMe
Alessandro Portale [Mon, 1 Nov 2010 18:19:32 +0000 (19:19 +0100)]
Move hide implementation of conditional show()
...and do not call it show(), because that is the signature of
a non-virtual base class function. showExpanded() sucks as name,
and hjk, who reviewed this is not convinced.
But showExpanded() is still better than show().
Task-Number: QTCREATORBUG-2979
Reviewed-By: hjk
Leena Miettinen [Mon, 1 Nov 2010 13:34:51 +0000 (14:34 +0100)]
Doc - sync up master with 2.1
Apparently, the forward merges lost quite some information.
Reviewed-by: ossi
hjk [Fri, 29 Oct 2010 13:23:13 +0000 (15:23 +0200)]
Add a little tool doing the job of 'qmake -project'
This creates a .pro from all "source" files below a given directory.
As I'd like to use Qt Creator as tool to quickly inspect and navigate
"alien" codebases a way to easily set up dummy .pro files is needed.
qmake -project takes far too long on projects of the size of Qt itself.
Friedemann Kleint [Mon, 1 Nov 2010 16:04:48 +0000 (17:04 +0100)]
Exported header cleanup: Separate out CppQuickFixCollector.
Alessandro Portale [Mon, 1 Nov 2010 16:03:46 +0000 (17:03 +0100)]
Changing template/qmljsdbg-lib as suggested in QTCREATORBUG-2885
- Renaming the screen orientation enum and keys
- Explicit constructors
- Virtual destructors
- Renamed some occurences of 'Qml' in comments to 'QML'
- Adding descriptive comments to all generated files which should
not be touched by the user.
- Adding missing license headers to the qmljsdebugger sources
Task-Number: QTCREATORBUG-2885
Reviewed-by: Friedemann Kleint
Reviewed-by: dt
Friedemann Kleint [Mon, 1 Nov 2010 15:29:45 +0000 (16:29 +0100)]
Fix exported headers in Core and TextEditor.
- Unexport Core::Internal::MainWindow and remove its includes.
- Move RssFetcher from Core::Internal to Core.
- Unexport CopyTaskHandler.
- Move TextEditor's completion support and Refactor Overlay
helper classes from TextEditor::Internal to TextEditor as they
are exported.
- Move internal BaseTextBlockSelection into private header.
- Unexport TextEditorOverlay as they are not used.
con [Mon, 1 Nov 2010 12:22:54 +0000 (13:22 +0100)]
Fix test compilation on Mac by using rpath.
con [Mon, 1 Nov 2010 11:15:49 +0000 (12:15 +0100)]
Mac: Use rpath instead of executable_path.
Because executable_path and loader_path are just too inflexible for some
stuff. The rpath is supposed to be set to the Qt Creator app's Contents
folder.
Compiling on 10.4 now requires to enter compatibility mode via
QTC_TIGER_COMPAT env variable or TIGER_COMPAT_MODE qmake variable.
con [Fri, 29 Oct 2010 14:22:44 +0000 (16:22 +0200)]
Make tests compile on Mac. Use qtLibraryName instead of qtLibraryTarget.
qtLibraryTarget is only defined if used with TEMPLATE=lib, which makes
it fail in pri files that are used for app pro files. The tests still
don't run because of run time linking issues.
Friedemann Kleint [Mon, 1 Nov 2010 13:29:25 +0000 (14:29 +0100)]
Open File: Make it open in project directory if one is set.
Reviewed-by: dt
Task-number: QTCREATORBUG-2947
Friedemann Kleint [Mon, 1 Nov 2010 13:14:17 +0000 (14:14 +0100)]
ProjectExplorer: Move ToolChainType enumeration into separate Header.
Acked-By: dt
dt [Mon, 1 Nov 2010 11:39:37 +0000 (12:39 +0100)]
ProjectExplorer: Fix Open in graphical shell/terminal on virtual folders
Use the same code that is used for figuring out a good directory for
adding new files.
Task-Nr: QTCREATORBUG-2682
Oswald Buddenhagen [Mon, 1 Nov 2010 09:49:49 +0000 (10:49 +0100)]
update chinese translation for 2.1
this is a team work by the following people:
Beaver Xu <xtfllbl@hotmail.com>
cch123 <cao1988228@163.com>
shiroki <shiroki@cuteqt.com>
Rei <chloerei@gmail.com>
Merge-request: 210
Oswald Buddenhagen [Mon, 1 Nov 2010 11:26:17 +0000 (12:26 +0100)]
include region-qualified languages into the list
Oswald Buddenhagen [Mon, 1 Nov 2010 11:11:03 +0000 (12:11 +0100)]
Merge remote branch 'origin/2.1'
Conflicts:
doc/qtcreator.qdoc
hjk [Mon, 1 Nov 2010 10:53:33 +0000 (11:53 +0100)]
debugger: avoid one inferior call in QDir dumper
Reviewed-by: Friedemann Kleint
Friedemann Kleint [Mon, 1 Nov 2010 10:18:27 +0000 (11:18 +0100)]
ProjectExplorer: Remove internal classes from exported headers.
Thomas Hartmann [Mon, 1 Nov 2010 09:33:46 +0000 (10:33 +0100)]
QmlDesigner.propertyEditor: show that anchors are disabled in states
I also added a tooltip.
Reviewed-by: Lasse Holmstedt
Thomas Hartmann [Thu, 28 Oct 2010 16:09:52 +0000 (18:09 +0200)]
QmlDesigner.formEditor: fixes memory leak
Also fixes the memory leak in resize code.
cleanup
Reviewed-by: Marco Bubke
Sergey Belyashov [Mon, 1 Nov 2010 09:10:46 +0000 (10:10 +0100)]
Retranslated word "plugin"
Merge-request: 211
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Leandro Melo [Mon, 1 Nov 2010 08:46:55 +0000 (09:46 +0100)]
Generic highlighter: Don't search for pre-installed definitions on mac.
Reviewed-by: con
Leandro Melo [Mon, 1 Nov 2010 08:30:20 +0000 (09:30 +0100)]
CMake: Consider visual whitespaces format in the highlighter.
Friedemann Kleint [Mon, 1 Nov 2010 08:12:56 +0000 (09:12 +0100)]
Winutils: define Windows version correctly. Fix gcc warning.
Friedemann Kleint [Mon, 1 Nov 2010 08:02:18 +0000 (09:02 +0100)]
Debugger: Fix compilation with MS VC 2005.
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@nokia.com>
Bill King [Mon, 1 Nov 2010 03:58:04 +0000 (13:58 +1000)]
tests: more autotest cleanup
Bill King [Mon, 1 Nov 2010 01:43:36 +0000 (11:43 +1000)]
tests: make qmakeable again
Bill King [Mon, 1 Nov 2010 01:40:20 +0000 (11:40 +1000)]
tests: Allow tests to use creator libs/plugins directly (linux/mac)
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
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.
Thorbjørn Lindeijer [Fri, 29 Oct 2010 12:21:21 +0000 (14:21 +0200)]
Disable "Insert space after function name" when autobrackets are off
Reviewed-by: Jarek Kobus
Acked-by: dt
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.