Commit Graph

32962 Commits

Author SHA1 Message Date
Daniel Teske
005f5116a5 Android: Fix abi detection for 64bit devices
Change-Id: Idde12cd5bcd54d007245d3bdd93e8ab47d7f214b
Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
2014-11-18 16:14:39 +01:00
hjk
d493daffb9 Debugger: Rename Debugger:EngineType to Debugger:Type
Values "GDB", "LLDB", "CDB", the "Engine" prefix is a bit too
technical.

Change-Id: I81d97a435c796125015e8b7425e832420f338b9a
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-11-18 14:39:59 +01:00
Nikolai Kosjar
78ab287fc6 C++: Stop parsing a declaration after two tries
If we fail to parse a declaration, we rewind, eat the token and look for the
next token that might be a good candidate for a declaration start (e.g. an
identifier). This becomes cpu and memory expensive with super long and invalid
expressions like

    typedef b::m::if_< b::m::bool_<
	(sizeof(fun((Dummy *) 0, (ThisT *) 0, (b::m::int_<70> *) 0)) ==
	 sizeof(defined_)) >, b::m::if_< b::m::bool_<
	(sizeof(fun((Dummy *) 0, (ThisT *) 0, (b::m::int_<71> *) 0)) ==
	 sizeof(defined_)) >, b::m::if_< b::m::bool_<
	(sizeof(fun((Dummy *) 0, (ThisT *) 0, (b::m::int_<72> *) 0)) ==
	 sizeof(defined_)) >, b::m::if_< b::m::bool_<
	(sizeof(fun((Dummy *) 0, (ThisT *) 0, (b::m::int_<73> *) 0)) ==
	 sizeof(defined_)) >, b::m::if_< b::m::bool_<
	(sizeof(fun((Dummy *) 0, (ThisT *) 0, (b::m::int_<74> *) 0)) ==
	 sizeof(defined_)) >, b::m::if_< b::m::bool_<
	(sizeof(fun((Dummy *) 0, (ThisT *) 0, (b::m::int_<75> *) 0)) ==
	 sizeof(defined_)) >, b::m::if_< b::m::bool_<
	// ...some more crazy lines like this

Therefore, stop trying after two failures by looking for the next semicolon or
closing curly brace.

Task-number: QTCREATORBUG-12890
Change-Id: I6637daeb840dd549d669080775228fa91fc932eb
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
2014-11-18 13:46:34 +01:00
Eskil Abrahamsen Blomfeldt
657797f7a0 Android: Fix installing signed packages
This works around missing support for standalone installations
of signed packages in androiddeployqt. The tool will use its
arguments to decide what the package to install is named, so
the arguments need to match the ones used to build the package.
In particular, we need to tell it that we are creating a signed
package.

This is intended as a temporary solution. The tool should be fixed
to support this use case properly, but the changes needed there
were deemed too risky at this point in the release cycle, so we
apply the work-around for now.

Task-number: QTCREATORBUG-13431
Change-Id: I03163582979715e7daa389c49bf10a88b5879db7
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2014-11-18 12:50:50 +01:00
Ulf Hermann
a46fe36bce QmlProfiler: Fix toggling of internal client recording state
We cannot just set it unconditionally on setRecording() because the
client recording state is supposed to reflect the user's intention.
Instead, if the recording button's state differs from the intention
and then spontaneously changes to match it (through a change in the
application), we toggle the client recording state twice to make sure
everything is properly synchronized.

Change-Id: I070d38364e63ab9cf0597fabed3d326ac3685589
Task-number: QTCREATORBUG-13322, QTCREATORBUG-13430
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2014-11-18 12:45:34 +01:00
Eskil Abrahamsen Blomfeldt
9411cd2db3 Android: Don't create unsigned packages
The --release argument for androiddeployqt is really not very
useful, since it will create an unsigned package which cannot
be installed on a device or published in any way. This is a very
special use case, which I don't think we need to support in Creator,
and it should at least not be connected to the build flags for the
C++ code, since it's quite possible that you want to build your
application code in release, but still sign the apk with a debug key
to test it.

Task-number: QTCREATORBUG-13431
Change-Id: I752bfdf396eab596637ab111c7844128962db1fd
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2014-11-18 12:37:28 +01:00
Daniel Teske
ce65e9d739 ProjectExplorer: Fix crash on renaming
Nested event loops rearing its ugly head. Avoid all the trouble by
opening the message box on the next iteration of the event loop.

Task-number: QTCREATORBUG-13428
Change-Id: I3c06d649464c34875da9601fb2e13227a0397836
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-11-18 12:25:11 +01:00
Daniel Teske
697b2074d3 Android: Make Bundle Qt Deployment the default deployment method.
Debug Deployment broke with Android 5. Also show Android 5 devices
as incompatible in the device dialog if we are using debug deployment.

Task-number: QTCREATORBUG-13419
Change-Id: Ic321cfa46eb724f87f338af9c4b50face06c7c06
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2014-11-18 12:05:06 +01:00
Erik Verbruggen
6cfd843580 C++: Only start/stop timers from the UI thread.
Change-Id: Ib694d2aeaef3b62caf3d3624e6b1c3e643197c2d
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2014-11-18 11:02:24 +01:00
Ulf Hermann
3aebcdc540 QmlProfiler: Don't switch to designer when clicking on events
We want to only navigate the text editor when browsing through profile
data.

Change-Id: I2156b9853a6a1547a52c491ea021a68ca4f6dde9
Task-number: QTCREATORBUG-13433
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-11-18 10:43:14 +01:00
Eike Ziller
8b57492f35 EditorManager: Introduce flag to not switch to design mode
Change-Id: I004c00e9f9dd61cc5495790b8e83dd857b404193
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
2014-11-18 10:31:10 +01:00
Fawzi Mohamed
7e1b512f31 qmljs: add isIdle method to detect background parsing/scannig
If the qmljsmodel has no background task, then isIdle returns true

Change-Id: I31420343c560c5ed118f371f7be347eadb6622f4
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-11-18 10:04:54 +01:00
Lukas Holecek
0e83172b0b FakeVim: Indent block correctly
In situation:

    void f() {
    // Cursor is HERE.
    }

the code after ">i{" command is indented as (with shiftwidth=4):

    void f() {
        // Cursor is HERE.
    }

Change-Id: I48283c91c32fc407bbdb24349f2491461e401ee9
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-18 10:03:41 +01:00
Lukas Holecek
5881f6cb79 FakeVim: Text cursor is thin when selecting text with mouse
Task-number: QTCREATORBUG-12809
Change-Id: I2b2e5cdbd8ab332e1bd05fb5c7857409318b736f
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-18 09:47:14 +01:00
Lukas Holecek
853a7b1c37 FakeVim: Added helper function to retrieve character at a position
Change-Id: I9798adeec3b92f093a275d0af885a4546b4c545c
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-18 09:43:09 +01:00
Lukas Holecek
3a03162fba FakeVim: Correct behavior of command "D" in visual block mode
Command "<C-V>...D" deletes characters inside and behind
block selection.

Change-Id: I2589bc560306a9a5a893f810c8c8037f44517af7
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-18 09:39:48 +01:00
hjk
7c9c5bda94 Debugger: Add variables for compiler and debugger display name
Change-Id: Iee98442317fb1d057ddd7ce7b993124c584660b0
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-11-18 09:01:41 +01:00
Friedemann Kleint
7a69585b0a Codepaster: Join actions, always open dialog.
Remove the "Paste from clipboard" action and move the functionality
into "Paste Snippet". Introduce a new overload for post() taking
a flag mask specifying the sources and use this for the
CodePasterService class (used by the diff editor).

Task-number: QTCREATORBUG-13401
Change-Id: Iadc3560a8a3bdaa817bc4a86007c2682feeb4b77
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-11-18 08:44:48 +01:00
Lukas Holecek
0790ee8159 FakeVim: Remove superfluous cursor shape changes
Change-Id: I6996d82a0a3b0e0a7bb5ddc9732297bebd368a2d
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-17 17:27:28 +01:00
Lukas Holecek
b920aadf25 FakeVim: Removed unneeded variable
Change-Id: I55ef1765c103b41b67583169718b899a8d44cac3
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-17 17:25:20 +01:00
Kai Koehne
2d25e6290a Do not show rebuild dialog when checkboxes are changed from code
Only show the "Do you want to recompile now?" modal dialog if the
"Enable QML debugging" or "Enable Qt Quick Compiler" checkboxes have
been changed directly by the user.

The previous change let the QML debugging checkbox update also when the
.pro file has changed. Showing a modal dialog in such cases interrupts
the user's flow, and is unexpected.

Change-Id: I9304cbecee7e201694ff72ac8c0f38cedf5fb416
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-11-17 16:57:24 +01:00
Fawzi Mohamed
081115e5e6 qmakestep: correctly update qml debugging checkbox
A change of the project languages (for example when the qml code
model is updated, which happens quite late) can add or remove
the QMLJS language, and thus change the value of
linkQmlDebuggingLibrary. This should be shown in the UI.

Change-Id: I55b6a866be6d0e356ed516568124bf3e80045078
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2014-11-17 16:57:20 +01:00
hjk
6d482bafec Debugger: Remove a soft assert in a valid LLDB code path
Pending breakpoints have zero resolved locations.

Change-Id: I18cecfabe8dcfebb7733030a404f75603464d157
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2014-11-17 14:11:25 +01:00
Erik Verbruggen
64a0a72a54 Beautifier: change QTC_CHECK to QTC_ASSERT.
Return when the check fails, so there won't be a nullptr deref 2 lines
down.

Change-Id: I4dd1ba13798a57700c486e4b1f24b45afb2837ad
Reviewed-by: Lorenz Haas <lykurg@gmail.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
2014-11-17 13:42:18 +01:00
hjk
1b31e8eebd Debugger: Introduce "Close memory buffers on exit" option
The usual case is probably to want normal editors stay open,
but memory/diassembler removed, but all other combinations
may be useful at times. So use two options instead of one.

Change-Id: I58c3951cc507c7e66a8d7a65b459a036e6a5d801
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-11-17 11:45:09 +01:00
Thomas Hartmann
4c614d970b QmlDesigner: Make it easier to disable QmlDesigner
Exporting DO_NOT_BUILD_QMLDESIGNER disables the build of
the QmlDesigner plugin.

Change-Id: Ia3809268816cd84ef23b872f8df4709e381b3618
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-11-17 11:24:53 +01:00
Orgad Shaneh
a4b4728267 VCS: Rework disabling of ambiguous actions
Task-number: QTCREATORBUG-13364
Change-Id: Ib9dc98964983f1a2808a89d90969089a09d2b55e
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-11-17 10:57:07 +01:00
hjk
17c92cdeef Debugger: Don't retrieve full stack on frame switch with LLDB
Unneeded effort and also re-sets the marker to the top frame
somewhat spoiling part of the result.

Change-Id: Iebaa52dc8c0703f3245cac2ca15b942e3006993a
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2014-11-17 10:41:35 +01:00
Orgad Shaneh
aee3c2f531 Core: Introduce ICore::{add,remove}AdditionalContext
Simplify single operation

Change-Id: I172b9dfe8f97324d931d4f332ac1609d230e3400
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-11-17 10:08:28 +01:00
Lukas Holecek
5efe24b6b3 FakeVim: Save last change position directly to marks
Change-Id: I304fb125810f0857cc013e9617460d4827e9b238
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-17 09:12:55 +01:00
Lukas Holecek
56037e8aa4 FakeVim: Remove superfluous status bar updates
Change-Id: I6f5c310bcb56749c71db74b882632070166ef68b
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-17 09:12:32 +01:00
Lukas Holecek
31eb0f96d7 FakeVim: Update internal cursor if it changes externally
Change-Id: I8c335e5a79699d9ae1eefdb2cd60840eea1bb300
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-17 09:12:06 +01:00
Lukas Holecek
4631da97af FakeVim: Allow to use "i<C-O>v"
Change-Id: Ibd669a8ac75734b18b41066255a43ee8bda19743
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-17 09:11:41 +01:00
Lukas Holecek
f4ffaaa278 Fakevim: Refactor entering and leaving modes
Change-Id: I6fe40908bc53fa84d2be165f3ee1b9c2f3a8d5c5
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-17 09:11:29 +01:00
Lukas Holecek
86c4e341a1 FakeVim: Fix indentation commands
Partially reverts commit dfae736. Handling indentation commands in
visual mode cannot be trivially handled by alias.

Change-Id: If9189c41a4e585efef00c774e24382f1de3356e4
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-17 09:11:21 +01:00
hjk
5a351eaa50 ProjectExplorer: Add a MacroExpander member in each project
Provide Project:Name there by default, and make it accessible
from the target.

Change-Id: I2faa52dc8c0703f3245cac2ca15b942e3006993a
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-11-17 08:06:15 +01:00
Tobias Hunger
4d3d8bb730 Qbs: Make runMode of QbsRunConfiguration more consistent
Make sure to refresh the runMode if it is changed by Qbs. Make any
user change stick though.

Task-number: QTCREATORBUG-12947
Change-Id: Ie03fad764f1a4d927213ecbb226c0aecfcf791a5
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-11-16 10:30:15 +01:00
hjk
a2f4203753 Debugger: Tooltip timing workarounds.
There's some bad interaction between the delayed hide,
the deleteLater() from CloseOnDelete, and the async
evaluation. Work around by start from scratch for each
tooltip. On the downside we have more flicker.

Change-Id: I4801368c07895b652e10fe1d173b21cef7869ed0
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-15 20:11:13 +01:00
hjk
1101e556c6 Debugger: Make pinned tooltips a frameless Tool window
This avoids the "StayOnTop" situation described in QTCREATORBUG-13397
for the case of pinned tooltips.

Task-number: QTCREATORBUG-13397
Change-Id: I3801368c07895b652e10fe1d173b21cef7869ed0
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-15 15:50:42 +01:00
hjk
045905fbbd Debugger: Fix unpinned tooltip expansion
True expansion was setting another WidgetContent to
an exististing Tooltip. Arguably wrong in the base
Tooltip handling, but avoidable on the debugger side,
too. This was visible only on Mac.

Change-Id: I2e5a3273b571658b4dd4200c9b3a0e9542a16015
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-15 14:10:10 +01:00
hjk
715d3f4e9f Debugger: Fall back to assembler in LLDB
... if source file does not exist. This is the same
logic as for GDB now.

Change-Id: I3e5a3273b571658b4dd4200c9b3a0e9542a16015
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-15 13:37:45 +01:00
hjk
82268eb77c Debugger: Use line information to find matching scopes for tooltips
More robust to variations in tool chains than function names.
(e.g. GDB reports 'foo' and LLDB 'foo()')

Change-Id: I1e5a3273b571658b4dd4200c9b3a0e9542a16015
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-15 13:37:12 +01:00
hjk
9f6f2e7a0e Debugger: Re-enable tooltips for non-local values for LLDB
It works again with the base infrastructure.

Change-Id: I5f8534dcc6eaa6675bd698151a592c0930cc4843
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-15 13:36:43 +01:00
hjk
ece15ae846 Debugger: Mention that LLLDB stderr output is unexpected
Change-Id: I21e23c9eab983c19fd9ab31a9fade4105c898de9
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-15 10:12:53 +01:00
hjk
c423395044 Debugger: Handle inferior start failing in LLDB
Change-Id: Ia6fb30d5dc4de4dce74affe0266d0fe48076e07c
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-15 09:59:21 +01:00
hjk
eecad29245 Debugger: Mention python executable in log output start message
Change-Id: I239b11cc4919ae15746f3059080907e6302c20c3
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-15 09:54:14 +01:00
Christian Kandeler
b542997cf8 Update qbs submodule.
To HEAD of 1.3 branch.

Change-Id: Ia829e93830fff3b047dc510fc990f3e019b2cde1
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2014-11-14 16:56:41 +01:00
BogDan Vatra
2c5e0c9c5d Android 5.0 is not unknown anymore.
Change-Id: I414912b8f78f078ffa1338ad2c0d23b37a12993d
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2014-11-14 14:50:55 +01:00
hjk
51012b117d Debugger: Pinned LLDB tooltip stepping with out-of-source builds
Previously it "released" on step as the scope paths from the code
model and the debugger report "differed" ("a/b/../c" vs "a/c")

Change-Id: Ida094581cfaa53b00f9186495870854ca431f041
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2014-11-14 14:24:24 +01:00
Daniel Teske
bc65b6b119 Fix regressions in KitMatcher
Task-number: QTCREATORBUG-13323
Change-Id: I48ddc83c40396a336a4c8e83ef4f5148e131c930
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-11-14 13:27:20 +01:00