Commit Graph

31174 Commits

Author SHA1 Message Date
Orgad Shaneh
578d18691a SynchronousProcess: Replace last QByteArrays with QStrings
Matching \n in a QByteArray is wrong. For example, it detects Ċ (U+010A)
and ਛ (U+0A1B) as end-of-line

Change-Id: I9c03d0b19da3d328e706ff2c89f09713be870f34
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-08 11:15:59 +02:00
Orgad Shaneh
5da86a0757 Git: Follow renames on log
Reverted because a dependent commit broke compilation

Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
(cherry picked from commit a53cc559be)

Change-Id: I8de3dbeca7eed3815eb5f0843eba6a86d371675e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-08 11:14:42 +02:00
David Schulz
11d2d74476 Editor: Keep selection on updateCurrentSelection().
Task-number: QTCREATORBUG-9959

Change-Id: Ib3324e78bc36790e588c56af7474d3eb968032dc
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-08-08 09:20:07 +02:00
Nikolai Kosjar
eddf5916b7 Fix compile error in AnalyzerManager
Change-Id: Ic02f7f68a1edfc8e85afa4e120eea53aa9c1a49b
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-08-08 09:04:04 +02:00
hjk
1c56d691cc Analyzer: Remove one level of indirection in AnalyzerManager
Change-Id: Ieb832e6aba1afbfa0d4f55ef12cad3f8333334b3
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
2013-08-07 18:03:30 +02:00
Orgad Shaneh
35798d4ad6 VCS: Use a single filename for log
The list always contains a single entry (or none) anyway

Take 2. This time it actually compiles ;-)

Change-Id: I71a9822360a9b569ba79afa0f575e27918bb2e03
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-07 17:43:58 +02:00
Nikolai Kosjar
92afe048ef Debugger: Fix PPToken dumper
Done-by: hjk <qthjk@ovi.com>

Change-Id: Iaccb29d4c74922337ada05971bb392a1458c94ef
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-07 16:23:08 +02:00
Andre Hartmann
5dc51b3e1f Locator: Better sorting of command entries.
For the input "git am" is "git amend" a better match than "git blame".

Change-Id: Id0cf91b62dac8b6c54f6de7c0698a375765e936d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-08-07 12:50:52 +02:00
Orgad Shaneh
0b4300a68c EditorManager: Make closeEditor public
And use it where appropriate

Change-Id: I0f37b8aada6eaa9be6743724b91a59173a01cb0c
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-08-07 11:08:36 +02:00
hluk
5a02089e3c FakeVim: Record jumps on paragraph and bracket movement
Change-Id: I7e1bfad127a11118606efbf603bbf8a393ec00b0
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-07 10:43:38 +02:00
Orgad Shaneh
7c5b19ebf4 Revert "Git: Use a single filename for log"
Breaks compilation

This reverts commit a05ea71133

Change-Id: I713f06a1fe1ff24f4721cda082fb732dc3f5c270
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-08-06 18:27:09 +02:00
Orgad Shaneh
fe25ae9935 Revert "Git: Follow renames on log"
Depends on a commit that broke compilation

This reverts commit a53cc559be

Change-Id: I7b697be1c97bd25f15e2a97927dbc7d03dc456e7
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-08-06 18:27:06 +02:00
Orgad Shaneh
a53cc559be Git: Follow renames on log
Change-Id: Ic2666e62f5226780f68da0cdda0229b343d38116
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-06 17:24:15 +02:00
Orgad Shaneh
a05ea71133 Git: Use a single filename for log
The list always contains a single entry (or none) anyway

Change-Id: I567b622efd42dd6f676bebb92fbf1c8774bd80ff
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-06 17:23:25 +02:00
Orgad Shaneh
ec247074d4 Git: Prompt to commit when merge tool finishes after merge
Change-Id: I41a7e7febb77706e84595d560a8abb56a018a823
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-06 17:22:39 +02:00
hjk
91de546680 Analyzer: Flatten AnalyzerManager::addTool
Add tool/startMode combo one by one.

Change-Id: I1e6cfe98fb1b1291cae6f440105991f3f99f2a6a
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
2013-08-06 16:15:05 +02:00
hjk
0d2ef9fca2 Analyzer: Inline Setting::registerTool into its only user
Change-Id: I10f57785bd26a15aef6fe72f26e7bf28a3a8d31f
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
2013-08-06 16:14:54 +02:00
hjk
d95ae65c62 Analyzer: Use action as handle for tool plus start mode
Change-Id: I33f99f28fb99c21cc62cda57ec1ba1aa2963b065
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
2013-08-06 16:14:41 +02:00
Tobias Hunger
2e004b7367 CustomToolChain: Fix release builds for non-windows
Change-Id: I5f2b73088db2353c7f13875391f11763b66434be
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-08-06 15:15:25 +02:00
Tobias Hunger
af4357b07c Fix possible crash when clicking on Filenodes with a line number
If the path() set on that node can not be opened, then the editor
is 0 and thus there is a crash.

Task-number: QBS-367
Change-Id: I8887a3bb84e19292d97357df49ef988d74bf6739
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-06 14:57:41 +02:00
David Schulz
48f161641a Debugger cdb: Fix dump of unsigned __int64 for cdb 6.11
The local variable output of unsigned __int64 differ between 6.11
and 6.2

6.11: 0x222`23456789
6.2:  0x00000222`23456789

So we must iterate over the value to find and remove the 64bit separator
(`) instead of just expect it at the 10th character.

Change-Id: I8017c83707b29fa0a510bf621e57e9da6895b63a
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-06 14:18:49 +02:00
Tobias Hunger
b852865285 Update Qbs
Change-Id: I94f9b92e993c09a8a587c39fbd41310fc5b82475
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-06 14:18:17 +02:00
Tobias Hunger
c2f83e3265 Fix build with qbs
Change-Id: Iff654636522bd41e96dfae6183f95c4dfcb53829
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-06 13:42:23 +02:00
Thomas Hartmann
e7f81afc4f QmlProjectManager: removing declarative dependency
We can parse the .qmlproject files without using the declarative module.

Change-Id: I78a910c9ec9477f5c6fbcdca23f62ab841ca4368
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-08-06 12:50:10 +02:00
Kai Koehne
18c739c82d Remove unused local variable
Fix MSVC warning C4189: 'em' : local variable is initialized but not referenced

Change-Id: I8b86dc95c1e05302909bb35c22949931db774c2a
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-08-06 12:39:15 +02:00
David Kaspar
41f8674c3e Qnx: Fixing incorrect ssh key generation
blackberry-connect tool requires to have public key with no comment
or comment with 'usename@hostname' format
QSsh::SshKeyGenerator creates comments in 'QtCreator/TIMEZONE' format
there we are stripping them out

This issue has been introduced by commit:
bd064d50e6

Task-number: QTCREATORBUG-9888

Change-Id: Ied96720b004cfe4f5bb95adec3401b6b6d30db5c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-06 11:46:00 +02:00
Orgad Shaneh
c83cf66d28 Fix compilation
Broken by debfc1718f

Change-Id: If8bb67572ea33c3cde4c3b474e0c37b8ca2f058f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-08-06 11:26:42 +02:00
hluk
76d4084234 FakeVim: Bracket movement commands
Added commands ]], [[, [], ][ for movement.

Task-number: QTCREATORBUG-9527
Change-Id: I0c363427505c9ef6274ed1cf735c9fbc43cb4bd9
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-06 10:56:59 +02:00
Orgad Shaneh
debfc1718f CustomToolChain: Support choosing an error parser
Change-Id: Ida2223d6e3c6577d13aa52827c00e3fa3f44a848
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-06 10:00:17 +02:00
Orgad Shaneh
208aeb79ed Introduce Utils::SynchronousProcess::normalizeNewlines
Replaces \r\n? with \n.

Some console applications (e.g. git-push, git-rebase) use \r alone to
move the cursor to the line's beginning. This should be replaced by \n
rather than just be erased.

Change-Id: I8d614d2b471e59decdbfa7f173ffa7fbdb11759b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-06 04:52:58 +02:00
hluk
1b13122cd1 FakeVim: Fix Vk command
Fixes visual representation (selection exported to editor widget) of
"Vk" command on empty line.

Change-Id: Iac5fabe53a65d7b94d0a1ed02aff3a7b3804a37b
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-05 18:24:35 +02:00
Thomas Hartmann
4f8c4a8840 QmlDesigner: crash fix
ModelNode::isComponent() is throwing an exception if the node is
not valid.

Change-Id: I4b34b9a583108923d584a73585f3001df68a741d
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-08-05 18:24:13 +02:00
hjk
51b390cada Analyzer: Remove some explicit uses of Analyzer::StartMode
Change-Id: I6d28a533d4ee2e93e4b3407e7fdd670c45886708
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
2013-08-05 17:09:22 +02:00
Thomas Hartmann
934291077c QmlDesigner: remove DesignDocument::changeToExternalSubComponent()
This function did nothing but call EditorManager::openEditor(), so we can
call it directly instead. It was not used consistently anyway.

Change-Id: I639ef346164be9260e887faac5dc6651ccfd92c5
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-08-05 16:40:32 +02:00
Thomas Hartmann
b108f72bc7 QmlDesigner: remove DesignDocument::goIntoSelectedComponent()
This function is highly confusing as a member of DesignDocument
and the logic can be implemented directly in the ShortcutManager.

Change-Id: Id722dcb71b542b4780614c9f895f06150ccb67ca
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-08-05 16:40:25 +02:00
hluk
e5c323e83a FakeVim: Monitor inserted text using signals from QTextDocument
Use QTextDocument::onContentsChanged() to monitor text inserted and
removed in insert mode for dot command (or just repeat with 2i, 3o etc.)
to re-insert same text.

Works even if auto-completion is replacing '.' with '->' for pointers.

Change-Id: Ie39edcdc9ec60bcf6c7d10f021248c3a0aee76b6
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-05 16:09:54 +02:00
Thomas Hartmann
a43ef07a6b QmlDesigner: move goIntoComponent() to DocumentManager.
Move ComponentUtils::goIntoComponent() to DocumentManager.

Change-Id: I038f4c56cb1745455613a1dbdeeb8bcb927da7f3
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-08-05 15:59:57 +02:00
Thomas Hartmann
1175759f1c QmlDesigner: Do not use ModelNodeOperations outside of DesignerActions
The ModelNodeOperations are an implementation detail of our
DesignerActions and should not be used in other places.

Change-Id: I495bfd043a6b1dd89952b0e7d2318e429678640b
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-08-05 15:57:49 +02:00
Marco Bubke
5437faf6c0 QmlDesigner: Remove unused QmlItemNode::defaultPropertyChildren
Change-Id: If20457a3d7f6017421b360a77c452395ff0e9219
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-08-05 15:54:01 +02:00
Marco Bubke
97007d0590 QmlDesigner: Use defaultNodeAbstractProperty
Change-Id: Ifa16795d6cca1256b86b69ab9f7da3e0644aec48
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-08-05 15:53:52 +02:00
Aurindam Jana
f8a2698bcd IAnalyzerTool: actionId() is re-implemented in derived classes
Change-Id: I5a0a485e239eeb33a9d8ad8cfd0f9cc40e1ff6d2
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-05 15:43:44 +02:00
Aurindam Jana
904dd68e5f QmlProfiler: Remove StartQmlRemote start mode
Change-Id: I7a4ef54a02fcc8dedb28e843a2f05d737324a877
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-05 15:33:48 +02:00
Marco Bubke
56bdb0d1ea QmlDesigner: Remove AuxiliaryDataauxilary if data is invalid
Change-Id: Ifc802442f54b4c84e1df04cbd8c59ad48c745aa5
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-08-05 15:31:10 +02:00
hjk
835ef9507b Analyzer: Use the run mode stored in the parameters instead of a copy
Change-Id: I045622efa22bfcb26f9161556ccbbfb3df08599d
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
2013-08-05 15:10:47 +02:00
Daniel Teske
84b479225e QtVersion: Special treatment for qthooser
Resolve which qmake qtchooser will forward too, as that qmake will put
it's path into the makefile.

Task-number: QTCREATORBUG-9841
Change-Id: Ib7a17c7683550ce3bb9172c7428a0efc328652f5
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-05 15:10:07 +02:00
Aurindam Jana
e61c797c6d QmlProfiler: Use StartLocal instead of StartQml start mode.
Change-Id: Iee7895e9cafc373c32749f3dcc44a690dfc551bc
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-05 13:19:44 +02:00
Thomas Hartmann
37cc7657e2 QmlDesigner.Model: adding isComponent to ModelNode
This function checks if the ModelNode is a Component or has a delegate
which is a Component.

Change-Id: I6bc92c3246b58eb04a5d37722e821dbed52147e5
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-08-05 13:05:55 +02:00
Thomas Hartmann
361821c8ec QmlDesigner: moving CrumbleBar and ComponentAction
Moving the CrumbleBar and the ComponentAction out of the FormEditor
into the DesignModeWidget.

These widgets are about document navigation and do not belong to
the FormEditor.

Change-Id: I5cd177d70f7c8f9cc2913c8c3c640d62fefd718d
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-08-05 13:05:47 +02:00
Tobias Hunger
848378378f Perforce: singleton cleanup
Task-number: QTCREATORBUG-9763

Change-Id: I8dbf3c1e5b7e1bea525123bf02a7e9952c94abe2
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-05 13:03:07 +02:00
Tobias Hunger
1ab065add3 Macros: Clean up singleton APIs
Task-number: QTCREATORBUG-9763

Change-Id: I76c4d60279f738272b0cf5fda651ce266f798c2c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-05 13:02:58 +02:00