Commit Graph

57165 Commits

Author SHA1 Message Date
Ivan Donchevskii
52bd5173fb Clang: Remove extern and static declarations from symbol outline...
... in case they appear within the function body.

Task-number: QTCREATORBUG-20434
Change-Id: I6d12ab857cca5fe8479ac3fb426329ae7d732567
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-06-04 08:46:25 +00:00
Ivan Donchevskii
b0c0119345 CppTools: Use cursor range for better outline navigation
Clang provides cursor range for each declaration in
symbol outline. Use that information to search for
more accurate correspondence between a cursor position
in editor and an entry in symbol outline.

For example skip indexes with not matching ranges to
prevent pure declarations from automatically become
parents of everything coming after them.

Change-Id: I0ef95c26772050cd6655e830288c46118aba38bb
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-06-04 08:43:44 +00:00
Ulf Hermann
92530fd05d QmlProfiler: stop trying to connect when the application quits
Change-Id: I3b33ced218320a19fd4e4e834093c0f3b67a8cba
Task-number: QTCREATORBUG-20499
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-06-04 08:28:18 +00:00
Christian Stenger
f1881ac2fc Tests: Fix defining path to sdktool
Replace backslashes with normal slashes as Qt handles them
inside paths correctly itself. Otherwise we might end up
using unknown escape sequences which leads to not executing
anything and a passing test.
Escaping the blanks is not necessary as they are handled
correctly automatically.

Change-Id: Ib1a81949c54d41b7864e30a1371de2e148f96bb8
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
v4.7.0-beta1
2018-06-04 04:52:27 +00:00
Tobias Hunger
4539acce04 ProjectExplorer: Fix possible crash in Projects mode
Change-Id: Ic57dac0487d03d88e0d9d37f67c55ae36e84af4d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2018-06-01 14:04:18 +00:00
Tobias Hunger
73f617ab34 CMake: Simplify code
Emit signal in addCMakeTool method directly instead of later.

Change-Id: I4640ffdf76d22f80a8c1ee14f8d79cc7885ddd70
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-06-01 14:03:19 +00:00
Tobias Hunger
bef6d49adc QmlProject: Remove unnecessary code
The normal RunConfiguration already triggers this.

Change-Id: I33f8704e28768efc264a2e2e717284ba7615dc08
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-06-01 14:03:02 +00:00
Oswald Buddenhagen
74fd1a9732 Merge "Merge branch '4.6' into 4.7" into 4.7 2018-06-01 13:11:26 +00:00
Leena Miettinen
fff6065a69 Doc: Add a question to FAQ about QML imports not being found
This results in error messages and missing functionality.

Change-Id: I041ea8e61f3b4cd113964d2c5dfc609e6581c2f7
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
2018-06-01 13:08:37 +00:00
Leena Miettinen
af1bd287a8 Doc: Update the FAQ
The Welcome mode is no longer implemented using Qt Quick 2, so the
problem arises later, when opening Qt Quick Designer or QML Profiler.

Change-Id: Ifbe50bdb9cfc1709842413d271d96378549eb673
Reviewed-by: hjk <hjk@qt.io>
2018-06-01 11:30:39 +00:00
Leena Miettinen
071a09f312 Doc: Update screenshots of Kit options
This is now a top-level category, so the tab order is different
from before.

Task-number: QTCREATORBUG-20511
Change-Id: I0978dd12f1ea55cb4cb97f2635b9c1ef7b623c5f
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2018-06-01 11:30:22 +00:00
Christian Kandeler
fd710f15c9 Update qbs submodule
To HEAD of 1.12 branch.

Change-Id: If93ae9f977882a1f0663c93e2aff21511322395f
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2018-06-01 11:24:05 +00:00
Oswald Buddenhagen
c065ea9326 Merge branch '4.6' into 4.7
Change-Id: Ieddac600af64f3b278340c4e3555cee0f4190bcf
2018-06-01 12:30:28 +02:00
Leena Miettinen
6c9343c2bb Doc: Describe "Auto-create build directories" CMake option
Change-Id: I36bda5ae451af8cebfb0c8435c017c7773875211
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-06-01 10:30:25 +00:00
Oswald Buddenhagen
1ddfb443b6 qmake: fix file id mapping lifetime management, take 2
turns out that ref-counting the vfs class is insufficient, as now the
ProFile cache (which expires after a timeout) could outlive all VFS
instances and thus refer to ids which were discarded and later re-used.

to avoid this, we let the cache instance hold a reference to the vfs
class.

amends d03fb3506.

Task-number: QTCREATORBUG-20524
Change-Id: Idd4478ffc1c2405b3b83df32fba45b1f687f6a18
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
v4.6.2
2018-06-01 09:34:33 +00:00
Orgad Shaneh
d7b8dcc684 Gerrit: Do not refresh dialog on update remotes when hidden
Change-Id: Ie9b00c1a117b1b2a3823dcb9249ed563b3dbd4a7
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-06-01 09:28:41 +00:00
Robert Loehning
2a3bfea8a9 Squish: Update for changed Options dialog
Change-Id: I823e88e80a00079dbf0a2cbdfd72973d44001063
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-06-01 09:25:16 +00:00
Nikolai Kosjar
234980699d Clang: Fix running UpdateExtraDocumentAnnotations job on outdated document
Prior to this change, the UpdateExtraDocumentAnnotations job (e.g.
providing the symbol outline information) was running concurrently to
UpdateDocumentAnnotations job on the outdated translation unit. Now it
runs on the same translation unit after the document was updated.

Change-Id: I4d84102423592d8a1310c1ac0ebbce9bd76a3714
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-06-01 08:30:49 +00:00
Orgad Shaneh
cf960e4788 Gerrit: Fix some clang-tidy warnings
Change-Id: Idaccca0bd6d7682feeac8a0964ce2abb788f3e99
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2018-06-01 05:59:04 +00:00
Christian Stenger
0988442e58 Android: Fix history completer key
This patch gets rid of soft asserts regarding empty history key
and a warning when trying to store these into the settings.

Change-Id: I64440ebe7ae1fca660a1dc66a1646da5d17798bf
Reviewed-by: hjk <hjk@qt.io>
2018-05-31 12:57:17 +00:00
Ivan Donchevskii
95aa52707d Clang: Add links to web pages in Clang-Tidy configuration
Each Clang-Tidy check get the separate link except
clang-analyzer which has only a whole group page.

Change-Id: I0b63cce8475109812280d9d44ac2d36aaa66e03b
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-05-31 12:43:45 +00:00
Ulf Hermann
2defef3d6f Debugger: Add tracpointoverlay.png to debugger.qrc
We're using it in debuggericons.cpp.

Change-Id: I397ee1afb02594d14089fe31bc4dfaee1901ee71
Task-number: QTCREATORBUG-20426
Reviewed-by: hjk <hjk@qt.io>
2018-05-31 12:42:06 +00:00
Nikolai Kosjar
b2f8ffdb20 Git: Fix handling Esc in "Create Local Branch" dialog
Change-Id: I8415e7ffcdbeb648b28273aa5791144e95f63de9
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-05-31 12:14:01 +00:00
Leena Miettinen
0666b11c01 Doc: Describe new kit options
Update the screen shot.

Task-number: QTCREATORBUG-20511
Change-Id: Ic21761cae6ba2ac5e29653d3ba27b520256ca66f
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-05-31 12:06:59 +00:00
Ulf Hermann
7b08624ae7 QmlProfiler: Only consider data as lost if we are recording
If the server stopped recording before breaking the connection, we're
fine.

Change-Id: Ic6d57cd4eb7c831cdd8aca1f305b44b9ecbd10dc
Task-number: QTCREATORBUG-20530
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-05-31 12:01:29 +00:00
hjk
397de4ff30 Tie SimpleTargetRunner desktop usages to individual RunConfigurations
This avoids the "catch all" that leads to conflicts with more specific
setups like the AppManagerRunConfig, and consequently lets us remove
the priorities in the RunWorkerFactories.

Change-Id: I382f00ca7f759eef995ac6fe749bb371ab027020
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-05-31 10:17:23 +00:00
hjk
f44e73b858 ProjectExplorer: Simplify BuildStepFactory
De-QObject-ify class, tr contexts are now the product's
context, which was the case in some BuildStepFactories already,
and is current state in {Run,DeployConfiguration}Factory.
One spurious object name removed.

De-virtualize canHandle(), it was never overloaded and is not
intended to be overloaded anymore.

Remove unused clone() function.

Change-Id: Iff7fba5f707505f868f94458084a18650535fa23
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-05-31 10:15:42 +00:00
Tim Jenssen
27b153a5e4 AndroidPlugin: show adb output in error case
Change-Id: I3a9b1e3ca86ab2cfecefd187d9574cf64ef6b1f1
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2018-05-31 10:14:25 +00:00
Ulf Hermann
af986c40a3 Tracing: Fix layout of RangeDetails
Only calculate the minimum width once all the children have been
positioned, round up the label width, and disable elision on labels.

Change-Id: Ia0ff6d5a08af2a5ceefd825fbe487a1d9969967d
Task-number: QTCREATORBUG-20502
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-05-31 10:11:48 +00:00
Ulf Hermann
aee9cde160 QmlProfiler: In statistics view use source model for location lookup
The sorted model's rows are not equivalent to typeIDs.

Change-Id: I88868e192079f61bd1d336dac98142fd415d9a4a
Task-number: QTCREATORBUG-20501
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-05-31 07:50:48 +00:00
Christian Stenger
4b0a4c1660 AutoTest: Fix build key handling
The build system targets no more contain the additional
pipe character. This patch fixes some 'guessed config'
warnings.
The check for the build key can now also be done
without restriction as it is unique nowadays not only
for Qbs builds.

Change-Id: Ic4e62d678c2188d0591c618cdcc156580b40b834
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-05-31 07:34:47 +00:00
Ulf Hermann
cb70c38ca2 QmlProfiler: Actually update the details when rewriter tells us to
Before, only the signal was sent. While we're at it, also disambiguate
the method and signal names.

Change-Id: Iafce9b06841d7faedfefdb0638d0fa1f60c061c1
Task-number: QTCREATORBUG-20500
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-05-31 07:13:56 +00:00
Ulf Hermann
7a68196328 Tracing: Don't change visible features on clearing and replaying
This used to be important for the mockup in the Timeline, but as the
mockup looks just fine with all available features visible, we can drop
it. As TimelineModel::clear() clears the "hidden" flag, we have to
restore that one on initialize(), though.

As a side effect the visibility settings are retained across profiling
sessions now.

Task-number: QTCREATORBUG-20503
Change-Id: I1512ab7e494ed79d20e2097d68f8494990cfecbb
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-05-31 07:12:04 +00:00
hjk
4feb2259d9 Debugger: Code cosmetics
Sprinkling in const and ranged for.

Change-Id: I5d11d57f64140021397c23734c7373544ebebb6f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-05-31 07:10:47 +00:00
Nikolai Kosjar
89c42161fa Clang: Add "Clang Code Model" group box to code model settings page
...and move existing widgets (hints about enabled/disabled plugin,
diagnostic config chooser).

Change-Id: I3097fad30d5bbe578f0a822f6f5615e48c1595b1
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-05-30 14:18:03 +00:00
Nikolai Kosjar
b1ecfe5c5d Clang: Add "Outline of symbols" to implemented services in doc
Change-Id: Ic1dd6f644b60c5bdcbbb2a75ca119311c5f827df
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2018-05-30 13:07:24 +00:00
hjk
829df213a4 QmlJSEditor: Remove unused class QmlJSPreviewRunner
Change-Id: Ide6f2ba000e361545500da398740cc6b54efdc6d
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
2018-05-30 13:04:12 +00:00
David Schulz
760a632936 Tools: Fix architecture detection for wininterrupt
Previously, the detection relied on the variable CPU which
is no longer set current versions of MSVC.

Use newly introduced variable VSCMD_ARG_TGT_ARCH (MSVC 2017) or
Platform (MSVC 2015) to detect 64bit.

Change-Id: I705dbd7d3d7912c36e588a5ff399e65b4ca6f500
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-05-30 12:49:27 +00:00
hjk
99631bcdb4 PythonEditor: Use new convenience function to set up run workers
Change-Id: I2c7b0c57a077794756643862c242c499d93295c9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-05-30 11:59:25 +00:00
Ulf Hermann
5e66f834e3 QmlProfiler: Keep text marks when replaying events
The text marks are conceptually part of the type storage, not the event
storage. We need to hide them on initialize and show them again on
finalize, though, so that they get updated.

Task-number: QTCREATORBUG-20506
Change-Id: I5fe50110b99ea81b9a7585758a30fcad98bfcaa3
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-05-30 07:49:38 +00:00
Leena Miettinen
fe09fc239c Doc: Add :<range>sor[t][!] to the list of FakeVim CLI commands
Change-Id: Ibe0b9724cdb242c869cdef662cc617d393cd4f4b
Reviewed-by: hjk <hjk@qt.io>
2018-05-30 06:52:46 +00:00
Alessandro Portale
ac0db4dc3b Core: Fix icon size calculation in the mode bar (Icon + text mode)
This amends 768f0a6209 . The order of
setting a painter font and using the fontmetrics of the painter font got
swapped, and therefore the size calculations were done with a wrong
font.

Task-number: QTCREATORBUG-20404
Change-Id: I98d1fbbbf467ded1dc0288784036595976b46e10
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-05-29 14:37:40 +00:00
hjk
a91a270f8f ProjectExplorer: Inline RunWorkerFactory::registerRunWorker
... into its only caller.

Change-Id: Ie06c0bdf8ba0ac95bd9dae0d0bd45cb0a3f881ea
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-05-29 14:30:33 +00:00
hjk
772098c710 Inline RunControl::canReUseOutputPane into its only caller
Change-Id: I2e858ab3bf715b41c26cfb6246d470787d003e3c
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-05-29 14:30:22 +00:00
Eike Ziller
bb28b10add Introduce static_container_cast
Casting all elements of a container, similar to qobject_container_cast.

Change-Id: Ib455fe8c7fa0d4acda7e29685c3100638a0152f8
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-05-29 13:44:51 +00:00
Ulf Hermann
a5f83fb66e QmlProfiler: Suppress debug message in test
The application is expected to fail after the transition to "Starting"
there.

Change-Id: I61e69df73ca9db82b9649727b69800927b1c16c5
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-05-29 13:39:18 +00:00
Nikolai Kosjar
8960075b42 QmlProfiler: Fix comma in qbs file
Change-Id: I7ac4abf4b9a764c0d9ff2b7c3a8db299e92a2f7c
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2018-05-29 13:23:45 +00:00
Ulf Hermann
a5ec1097a0 Debugger: Support nested properties in QML inspector
There are various ways to generate nested arrays and objects in the QML
engine debug service. We can easily show them.

Task-number: QTBUG-68474
Change-Id: I3511a3f6f7631de4ab6a9d4b13ba9392ba4173dc
Reviewed-by: hjk <hjk@qt.io>
2018-05-29 12:55:51 +00:00
Nikolai Kosjar
c6f12991b0 ClangTools: Avoid freezing UI for many items
...if new items are added to the model or if filter is used.

When items were added, we have called
ClangToolsDiagnosticModel::diagnostics() two times:
 * from DiagnosticFilterModel::filterAcceptsRow()
 * from ClangTidyClazyTool::handleStateUpdate()

However, this does not scale since diagnostics() creates a temporary.

Fix this by accessing the diagnostics or the count directly from the
tree.

Change-Id: I4c6a32e0076c1b4228ed1b1ff9222c9918f92c5c
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-05-29 12:51:51 +00:00
Ulf Hermann
6b9ff15ad5 QmlProfiler: Move action registration out of QmlProfilerTool
This enables us to have multiple QmlProfilerTool instances without
conflicting action registrations. Ultimately there should be a way to
unregister actions, or to add some extra description on which tool
instance they refer to, but this is a minimal first step.

The main problem this fixes for now is the warnings generated by the
tests.

Change-Id: I2193fc48a5a68c52f46e5567919f3035bc93df36
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-05-29 12:14:58 +00:00