Commit Graph

31174 Commits

Author SHA1 Message Date
Orgad Shaneh
325c0beda5 Git: Show commit on double-click in fixup editor
Change-Id: I8cb08b0fcba3ddac7223b39b3762ff71e8d61f8c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-06 10:25:10 +02:00
Tobias Hunger
8bbad43019 OutputParser: Allow to flush pending tasks.
Add a way to flush out tasks from the outputparsers. This is necessary
to make parsers that keep state more robust.

Flush parsers (once) before adding any new task. This keeps the sequence
intact.

Flush all parsers once the parsing is done to make sure there is no task
queued somewhere.

Task-number: QTCREATORBUG-9195
Change-Id: Icd37df1f470cb73123ad286d6900ad1047a1d512
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-06 10:04:38 +02:00
Tobias Hunger
14763118a5 Make test bench for IOutputParser tests more stable
Change-Id: I39a08912efdcf34ef680d508c41c4df9034125dc
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-05-06 10:04:23 +02:00
Tobias Hunger
fa9d57fb68 Task: Add clear method
Avoid needless increments of the task id counter for Task().

Change-Id: I6243b4fe9e8fd91653e236722282fa8f8a9ed82d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-06 10:04:07 +02:00
Leena Miettinen
b97af0ad87 Doc: edit Android dev instructions for Qt 5.1
Separate the instructions for configuring Qt Creator
for Necessitas and Qt 5.1 to make the process clearer.
Add missing information.

Change-Id: Iac8fb1d9bcdec57783905fae2e9fea1b222d28bb
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-05-06 09:47:21 +02:00
Aurindam Jana
b2a355725f QmlProfilerEngine: Use local variables within scope
Change-Id: I854255a66e23aa84f23443ef185c0d1e24de81d2
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
2013-05-06 09:42:06 +02:00
Aurindam Jana
36ed72f52b QmlProfilerEngine: Remove unused local variables
Change-Id: I164346dd4fc7c4b1f3dc2ebd2ef3b5db9f5474e2
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
2013-05-06 09:41:28 +02:00
hjk
e7ba815c02 Debugger: Fix display of frame addresses with LLDB
Change-Id: I097af582a476abb57104d6687eb7f0036cbe64a7
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-06 09:07:35 +02:00
Tobias Nätterlund
515b6266c5 QNX: Fix shutdown of inferior and inserting breakpoints on Windows
When debugging on a QNX device on Windows, neither
DebugBreakProcess(..) nor "-exec-interrupt" works for interrupting
the inferior process. Neither does sending it a SIGINT signal using
"kill" on the device.

This changes the local gdb process to run under the CtrlC stub on
Windows when debugging on QNX. This enables us to send a Ctrl+C
message to gdb, which interrupts the inferior, and allows us to
insert breakpoints during runtime on Windows.

Change-Id: I4b01fbe81138f3fe7a939a7e64267bac4eb8bf43
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-06 08:59:41 +02:00
Orgad Shaneh
ec84dd058a Fix indentation
Mostly 3 leading spaces converted to 4

A few other indentation issues

Change-Id: Ib0db5925cac4d2999faf5699cd570884cbcd4863
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-06 08:38:50 +02:00
hluk
cf1b82b152 FakeVim: Emulate insert mode more precisely
Set correct position for commands I, A in visual mode.

Don't repeat insert mode [count] times if cursor moved in insert mode
(or after <C-O> command).

Don't repeat movement in insert mode ([count] is used only to repeat
the first inserted text).

Dot command for insert mode should be cleared if cursor moved and user
started inserting a text.

Change-Id: I4dbd0fa4e7ecedc6623838c9ad855f83276da2ce
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-06 08:32:42 +02:00
hluk
ceeb03e47a FakeVim: Allow upper case letters in <nop>
Change-Id: I38534f917fc641decbae06da8db27a73b18d94f6
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-06 08:31:23 +02:00
Orgad Shaneh
aa5b049561 Git: Improve LogChangeWidget
* Enable display of local-only commits
* Enable specifying a top commit

Change-Id: I0688ba9ac670f709d2044ae2b7bff081fd86c860
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-04 20:01:23 +02:00
Orgad Shaneh
8695fe6d7c Git: Implement "Fixup previous commit"
Change-Id: Ia2584ff975ed0db614dc878a70ce4adbd5c3ba67
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-04 20:01:04 +02:00
Orgad Shaneh
5d325f6b1a Git: Use StashGuard inside RebaseManager
If the rebase succeeds without conflicts, pop

Change-Id: I4f0c6ad3061f4f69f7e5c9450f972cce5c15227d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-04 20:00:39 +02:00
Orgad Shaneh
fb40fd8297 Git: Allow reviewers specification in Push to Gerrit dialog
Change-Id: I6126411209d73797cc7e4f7c15a6a49b50366c63
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-04 19:59:44 +02:00
hjk
bfa85a509d Debugger: Add basic diassembly display to LLDB engine
Change-Id: Id65f983ffada2f8d08929a82c96767d8471d9444
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-03 17:33:35 +02:00
hjk
bd75748ce5 Debugger: Reduce timeout of LLDB stdin input
Snappier, but close to a busy loop now...

Change-Id: If4e31d35928c95fae29b3d221c5ff443386b933b
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-03 17:33:21 +02:00
Tobias Hunger
71709f316c Qt4PM: Reduce priority of qmake parser in makestep parser chain
This stops it from eating lines that are actually produced by
the compiler.

Change-Id: I725690eaee6fe223c7024299420a924b455d2723
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-05-03 16:46:07 +02:00
Eike Ziller
14eee567f1 Fix deployqt for qt4
Don't try to deploy qt quick 2 imports if they aren't there.

Change-Id: I1146ad8a81973af9e80c82caad515fea45b1530e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-05-03 16:31:56 +02:00
Eike Ziller
0093548981 Deploy qtquick2 imports for qml2puppet.
Task-number: QTCREATORBUG-9235

Change-Id: I9fae92bd9c1a07066d7d312008a7e10613b414f7
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-05-03 15:20:44 +02:00
Eskil Abrahamsen Blomfeldt
91d48fe727 Enable mechanism to bundle Qt in APK
If the Qt version built against is Qt 5, and the deployment
method is "Use libs on device" + "Use local Qt libs", Creator
will copy the required files into the app bundle and set
the necessary meta-data to make the Java code in the app
actually load them from the app bundle.

We also make this deployment method the default on Qt 5.

Change-Id: Ib7a33e7d1fbd22f76c85c31e1dbc68912a38eda8
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-05-03 13:13:03 +02:00
Erik Verbruggen
8e18adc70f C++: Fix crash in code completion.
Caused by a dangling pointer of a template instantiation which had been
cloned into the wrong control. The fix is to remove that control and
refer to the control of the bindings (which is the correct one).

Change-Id: I951a60f2e613aae1e4ac901ce99c820212018709
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-05-03 10:56:26 +02:00
Eike Ziller
a2171c2d82 Merge remote-tracking branch 'origin/2.7'
Conflicts:
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp

Change-Id: I7f319154d5865c47ccfd5f525f0fd7983733dd0e
2013-05-03 09:49:28 +02:00
Tobias Hunger
6999e3c339 Remove StatusDisplay.qml from qbs build system
It is already gone from qmake.

Change-Id: Iad2835d6b937fc7215da070a1c839139419026dd
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
2013-05-03 09:19:52 +02:00
Erik Verbruggen
364c95476e C++: fix possible null-pointer derefs.
Change-Id: Ie6a2398f3a9e5c26a9af1578e512da53a01d15f5
Reviewed-by: Sergey Shambir <sergey.shambir.auto@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-05-03 08:41:13 +02:00
Sergey Shambir
6344e2a02b QbsProject: use CFLAGS in addition to CXXFLAGS
Value will be passed to CppTools::ProjectPart::evaluateToolchain()

Change-Id: Ib365d91e9956fa59cc79107734c5ac8c89b34d4f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-02 18:26:09 +02:00
Sergey Shambir
9a36ec3f39 QbsProject: simplified C++ codemodel interaction.
Now it uses ProjectPart::evaluateToolchain() to read toolchain info with
given compiler flags.

Change-Id: Ia31aa1e6b9267ceac53c137e1729689046dcc815
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-02 18:26:05 +02:00
Orgad Shaneh
be7f73308c Git: Use consistent ordering for Merge Tool dialog
On Windows it is "Ignore, Merge Tool, Skip, Abort", while on Linux it is
"Merge Tool, Ignore, Skip, Abort"

That makes Ignore default on Windows, which is confusing

Change-Id: Id7e9e8dd6fd5748d518de4d94db47ae075268627
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-02 17:30:57 +02:00
Orgad Shaneh
a14968e178 Qbs: Use proper function signature for virtual functions
Detected by MSVC2010

Change-Id: I6ba98a72b8cf4e265887f256bebdd5d1582dbed8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-02 17:27:28 +02:00
Thomas Hartmann
e0f50c0468 Wizards: Adding simple wizard for QtQuick.Controls
Change-Id: I80746a3e77f94040a407ce25cec9ad6fac8b6fce
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-05-02 17:14:26 +02:00
Orgad Shaneh
20f1208e0f Git: Pass CommitData by reference
It is used for both input and output, the pointer is assumed
to be valid

Change-Id: Iad9a82dfb5ea4850584d4da848076699cddd23c2
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-02 16:52:55 +02:00
Orgad Shaneh
06da25f610 Git: Add commit type to CommitData
Change-Id: I900f3dd89eeeac61e29604ac459d36ecc6c0aa8f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-02 16:52:10 +02:00
Orgad Shaneh
cb055c1d0f Git: Simplify editor code a bit
* Introduce a const submitEditorWidget() and use it
* Directly use layout from ui

Change-Id: Ib566bab464d4f1c08a3f2af0edb5e1fa989c3160
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-02 16:47:19 +02:00
Tobias Hunger
633c11d184 Handle Qmake errors when running make in a qmake project
Qmake may be run by make, so make the makestep use the qmake parser
in addition to the rest in qmake based projects.

Change-Id: Ibdd3eb476d890d580a8417d691166c4dd33350cb
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-02 16:46:59 +02:00
Daniel Teske
3abe2a72ea UicCodeModelSupport: Make the code not so eager to run uic processes
Instead mostly postpone it until the contents are needed.

Task-number: QTCREATORBUG-9149

Change-Id: I83167537e97fbd965531d990c8073409ff7b0b32
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-05-02 16:39:33 +02:00
hjk
038f3c0c49 Debugger: Work around missing features in LLDB-167.2 on Mac
Change-Id: I357afd09e56f6be74187d2a5a647681dad698f98
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-02 16:32:58 +02:00
hjk
98653aa8fd Debugger: Add LLDB event handling for mixed debugger and user events
Change-Id: I357afd09e56f6be74187d2a5a647681dad698f99
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-02 16:13:11 +02:00
Tobias Hunger
c76c8df101 GccParser: Fix parsing of header files without extension
Change-Id: I4f0cc028814c0abf2ecae62aee6b38cc3e75f895
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-05-02 16:00:48 +02:00
Nikolai Kosjar
d47aed5201 CppEditor: Tests: Remove superfluous reference to CppEditorSupport
Also remove the introduced functions in CppEditorSupport. We can just
wait until the document is "Full Checked" via Document::checkmode().

Change-Id: I31d23016f5aa5d3c37e8e05078436ab901bfb2d7
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-05-02 15:50:56 +02:00
Sergey Shambir
7047cf0140 CppEditor: simplified Objective-C status check
Change-Id: Id318fc34b19295dacef63a7192a0ff11fef3e274
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-05-02 15:21:16 +02:00
Przemyslaw Gorszkowski
d14767a6af C++: fix highlighting type when there is using Namespace::Class
If type is not found we try to find 'using' declaration for this type.

Task-number: QTCREATORBUG-7903

Change-Id: I569db9e1a8504a5da3115ebbed2e823d5924f6ca
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-05-02 15:17:27 +02:00
hluk
e245f2d5f9 FakeVim: Break edit block only after a change
Change-Id: Ice885d3a51d0c5516ddabe8a8bdb9b1ce5ab7a06
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-02 14:52:16 +02:00
hluk
016a926ab7 FakeVim: Window movement with <C-W> and :only
Allow movement with <C-W> and h, j, k, l, plus capital alternatives to
focus furthest split.

Command <C-W>o or :only closes all splits except the current one.

Change-Id: I14ed57cff5d639c22d3eb325560922c10d0c92bf
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-02 14:48:04 +02:00
Jesper K. Pedersen
b563fc6db9 edit note should also be disabled when a note is not editable
Change-Id: I35622ee65ddb7476f43af0ef3aeb0eca6ba0ff4b
Reviewed-by: Vasiliy Sorokin <sorokin.vasiliy@gmail.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-05-02 14:16:54 +02:00
Thomas Hartmann
3aa424ca64 WelcomePage: Show demos in the examples view
Change-Id: Idc466b7e058375c0e393eb9f9dd2cc8f58abb2af
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-05-02 13:17:36 +02:00
Sergey Shambir
2ddb1f9849 GenericProject: simplified C++ codemodel interaction.
Now it uses ProjectPart::evaluateToolchain() to read toolchain info with
given compiler flags.

Change-Id: I97c643707e1626424824aa9b53786f146b0f4790
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-05-02 13:00:04 +02:00
Sergey Shambir
8ac43525fb AutotoolsProject: simplified C++ codemodel interaction.
Now it uses ProjectPart::evaluateToolchain() to read toolchain info with
given compiler flags.

Change-Id: I87fc03dbd450d8190e55de0635e1c8e1f8f11a40
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-05-02 12:59:58 +02:00
Sergey Shambir
535bdcc9d9 Qt4Project: simplified C++ codemodel interaction.
Now it uses ProjectPart::evaluateToolchain() to read toolchain info with
given compiler flags.

Change-Id: I9afce7090eba6fc0662981dfd065603ac235a83f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-05-02 12:59:49 +02:00
Sergey Shambir
2d8a9674b4 CMake: simplified C++ codemodel interaction.
Now it uses ProjectPart::evaluateToolchain() to read toolchain info with
given compiler flags, so it saves old behavior and also reads C version
and C++ extensions.

Removed check that model doesn't need to be updated, since check didn't
account ProjectPart enums.

Change-Id: I6dbebeecdb162ec5b885f9f1846756b586c22b23
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-05-02 12:59:44 +02:00