Commit Graph

63742 Commits

Author SHA1 Message Date
Denis Shienkov
cfbc13bd02 BareMetal: Display package info instead of family in UVSC
It is makes sense to show the 'package' identifier string
of the selected device instead of 'family'. Reason is that
'package' info is more informative. Besides, a 'package' info
also displayed in an original uVision wizard.

Change-Id: I01f53836dd2bd968ffb61e889211c6a892d7b5b7
Reviewed-by: hjk <hjk@qt.io>
2020-04-25 20:52:02 +00:00
Denis Shienkov
261c104175 BareMetal: Fix device selection properties parsing in UVSC
A problem is that the source *.pdsc file contains a five main separate
items: 'package', 'family', 'sub-family', 'device', and 'device variant'.
Each of this item may contain an unique properties, which we need to
separate in a resulting device selection structure.

But, earlier we ignore the item types at filling of the device selection,
that lead to overwriting some properties in a wrong way for a some *.pdsc
files.

To solve it, we introduce the five item types: Package, Family, SubFamily,
Device, and DeviceVariant. In this case we take in account a current item
type at filling the resulting device selection structure to exclude an
unexpected values.

Change-Id: Iaa79d1b82c284a5f30004ebdd7abc02e77872b4e
Reviewed-by: hjk <hjk@qt.io>
2020-04-25 20:51:51 +00:00
Christian Kandeler
adf0e57195 ProjectExplorer: Don't force a smallish maximum panels widget width
This widget can often benefit from more space, as we currently often see
cut-off text etc.
We now use a splitter, with the main widget originally taking up its
current minimum size, and the user being able to enlarge it according to
their preference.

Change-Id: Ibc5f0a54e0659613b3094181db258717d1886cb9
Reviewed-by: hjk <hjk@qt.io>
2020-04-24 15:32:52 +00:00
The Qt Project
86a3b94902 Merge "Merge remote-tracking branch 'origin/4.12'" 2020-04-24 11:59:18 +00:00
Eike Ziller
d79febdde9 Merge remote-tracking branch 'origin/4.12'
Conflicts:
	src/plugins/cmakeprojectmanager/cmakekitinformation.cpp

Change-Id: I90ef0063ed24e23bcb3d73fff086f50324faa1e2
2020-04-24 13:58:05 +02:00
Christian Kandeler
137c0ca673 QmlDesigner: Fix clang warning
src/plugins/qmldesigner/components/curveeditor/detail/selectionmodel.h:
62: warning: 'DesignTools::SelectionModel::select' hides overloaded
virtual function [-Woverloaded-virtual]
    void select(const std::vector<TreeItem::Path> &selection);
         ^

Change-Id: I68266a4281dca62c1c07940a981cfd1aff870ec8
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-24 11:33:28 +00:00
Christian Stenger
0655ddbd65 TextEditor: Display cursor position
Change-Id: Ie5fd13ee80dcf14b6e6c8c0e220f5e00e654dde2
Reviewed-by: Federico Guerinoni <guerinoni.federico@gmail.com>
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-04-24 10:38:40 +00:00
Christian Stenger
20b095c6b4 QmlJS: Fix palette support
Fixes false positive warnings of having no members
and allows to auto-complete its members.

Fixes: QTCREATORBUG-23659
Change-Id: I4da43b9d3f005f9c6cc759ec424bf67062beff78
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2020-04-24 10:34:58 +00:00
Christian Stenger
63db0f271f QmlJS: Fix lexer handling of escape sequences
Escape sequences inside strings need to get handled explicitly
to avoid wrong length and offsets of tokens to avoid follow-up
problems while highlighting or symbol interaction.

Fixes: QTCREATORBUG-23830
Change-Id: I4ab0b166bbab22ef3b7b54071e128416a14e97e1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2020-04-24 10:34:25 +00:00
Thomas Hartmann
d84bbdb876 QmlDesigner: Delete dangling transitions when deleting FlowTarget
Change-Id: Ic2bf68cd19ced976c5337b02bd9b1889c055f182
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-24 10:33:11 +00:00
hjk
85597f85b0 QmakeProjectManager: Fix missing run button activation
The problem could be reproduced as follows:
  - open any bigger qmake based project (e.g. QtCreator)
  - de-activate all kits
  - activate one kit
  - wait until the first parse (e.g. Debug build finished)
  - switch to Profile, and toggle the Shadow build button

The toggling re-starts the parsing.  The parse guard will not be released
in decrementPendingEvaluateFutures() (arguably correct as the parsing as
a whole is not done). On enteringing incrementPendingEvaluateFuture()
due to the re-start, the guard still guards the parse, but a new guard
is created in guardParsingRun(). As this happens while the build system
isParsing() is true, the created parse guard will be "non-guarding".
On assigning to m_guard, the original guard object will fire and then
be replaced by the non-guarding guard, that never fires again, so the
the build system will never have hasParsingData(), which is a
condition for the run buttons to activate.

As a workaround for people running into this issue in 4.12.0:
Select 'Run qmake' from the menu (any subproject suffices), and let
it finish.

Change-Id: If7a55db56ec67bac2635fb9a745b9aaf6ca6a413
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-04-24 09:58:34 +00:00
Christian Kandeler
02785342ac Fix some clang warnings about unused lambda captures
There are more, but we need to keep those because MSVC believes they are
required. This is the subset that satisifies both compilers.

Change-Id: I0b0a63d5496acc119a7f0513d3a1da0b76fa1fca
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-04-24 08:44:58 +00:00
Tim Jenssen
081186811d qds: remove workaround when qdocconf was somewhere else
After moving the QtDesignStudio documentation to the QtCreator
repository there is no need for these extra files in the dev
packages.

Change-Id: I4e24946bb6752403a6ecafb0c474332ad2317b1a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-04-24 08:34:16 +00:00
Christian Stenger
5d5cd15e1c QmlDesigner: Fix compile with gcc5.3
Amends 8d868d8bbb.

Change-Id: Ic8dd8829e6734031ddc49c75c778f3f6566a0acc
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-24 08:33:13 +00:00
Friedemann Kleint
6cfe092301 Fix printing source code
After qtbase/4a240bb67e72b34c80af448e0a74846609fa6975,
the scaling of the margins changed.

Fixes: QTBUG-81121
Change-Id: I6987fe8e25da1771dd2bcd36fff8558fefd3dee0
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
2020-04-24 08:23:05 +00:00
Denis Shienkov
fe076dbe41 BareMetal: Parse missed 'debug' element in *.pdsc file for UVSC provider
Some *.pdsc files contains 'debug' elements inside of 'device'
items which are should be handled too.

Change-Id: I4ec97dc29c8bbc204f17815183a6afaedcdd3619
Reviewed-by: hjk <hjk@qt.io>
2020-04-24 07:51:27 +00:00
Denis Shienkov
0f737dd708 BareMetal: Add support for J-Link HW debugger for UVSC provider
Now it is possible to debug target devices using the Segger
J-Link debugger:

* https://www.segger.com/products/debug-probes/j-link/

using the UVSC provider.

Change-Id: Id828c6015166432836c4d542d05c163363a9d40b
Reviewed-by: hjk <hjk@qt.io>
2020-04-24 07:51:00 +00:00
hjk
4ba131bdd6 Debugger: Handle failed breakpoints as unclaimed
Change-Id: I02a44db5391b174e75fc326ce217b271ee73c464
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-04-24 06:12:35 +00:00
Christian Stenger
d02f5664e5 ClangTools: Avoid accessing deleted run worker
Change-Id: I74b977ede0d153ae4f8d85e03090dfc21facd04b
Reviewed-by: hjk <hjk@qt.io>
2020-04-24 04:33:23 +00:00
Denis Shienkov
91536ae781 BareMetal: Don't handle an empty SVD file selection in UVSC provider
Change-Id: Ic7fbf2c403f85d7d79f194a12f67e852ff0bdd80
Reviewed-by: hjk <hjk@qt.io>
2020-04-23 18:03:46 +00:00
Thomas Hartmann
bbed542ec3 QmlDesigner: Expose typeFilter property
Change-Id: Iaf0c6db67eb25b730bc31f87b52b0ec93ab15266
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-23 17:22:00 +00:00
Christian Kandeler
4c064c5f9b QmlDesigner: Fix warnings about unused lambda cpatures
Change-Id: I73e7aeed02527efd657df44232c13bb2e136f5ee
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-23 15:33:18 +00:00
Christian Kandeler
69f7865c72 qml2puppet: Enhance qbs build
Add the optional QtQuick3D dependency that was so far only in the qmake
project file. Also fix annoying moc warnings for builds without
QtQuick3D.

Change-Id: Ic0f4f3de5b4a5d715332166d7390ad027dd377ed
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-04-23 14:40:02 +00:00
Christian Kandeler
e915cde44b QmlProfiler: Fix warning about unused lambda capture
Change-Id: I029497edaac5695d47a8930a304713fba48ded15
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-04-23 14:37:19 +00:00
Christian Kandeler
5ea2557125 Fix warnings about unused members in some clang-related classes
Change-Id: I564ac810ed8ae950e9ced54358929358379bfffb
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-04-23 14:20:27 +00:00
Christian Kandeler
3f9e517754 DiffEditor: Fix clang warning about hidden overloads
Change-Id: Iad4cbe1f2e97b862626deeecbcec496fe3457370
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-04-23 13:49:37 +00:00
Christian Kandeler
785b184fb6 QmlDesigner: Fix warnings about unused variables and functions
Change-Id: Ib907db11dcdcef9cbbb91c8fd7af22ae420796b1
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-23 13:49:04 +00:00
David Schulz
dee0997d38 QmlJSEditor: jump to file under cursor if it exists
Don't limit this functionality to files that are part of the snapshot,
but try to open all files. This will allow opening c++ files defined in
a qbs project file.

Fixes: QTCREATORBUG-22685
Change-Id: If2a2a2075e5d7113a7bb44625c0f29ef66138d3c
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-04-23 13:00:07 +00:00
David Schulz
e3a0fe71e4 CMake: fixup env if jom is missing
Add the applitcation dir path to the path environment variable
if jom cannot be found there. This should fix the cannot find
jom error for binary releases since we ship jom with qc.

Fixes: QTCREATORBUG-22645
Change-Id: Ia3b55f794d3ac4b5fd6d2e85cf19f00bd8cddd2c
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2020-04-23 12:59:51 +00:00
David Schulz
2aac4cc07f CMake: honor use jom instead of nmake setting
Only search for the jom cmake generator if this setting is
enabled.

Change-Id: Id8eed91d47f1f6ca2375fe0d169b21168c5ca4ff
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2020-04-23 12:59:43 +00:00
Leena Miettinen
169c3bb30c Doc: Fix path to image files
Change-Id: I8f9395bd5d8c5ae02e1bb994577b02c80c4c2564
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-23 12:42:47 +00:00
Christian Kandeler
486a86558f Utils::ListView: Silence clang warning about hidden overload
Change-Id: I8702353b65355f9ab97c10001045250586b3f858
Reviewed-by: hjk <hjk@qt.io>
2020-04-23 12:10:58 +00:00
Tim Jenssen
a37b6ae5fc QmlDesigner: crash workaround
Disable the timer to be safe. The issue is bothering us for a
very long time and we were not able to find the real
cause.

Task-number: QDS-343
Task-number: QDS-1984
Task-number: QTCREATORBUG-20364
Change-Id: I5023f27be25ba7971db80990eeb9562fd63dc15d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-23 11:52:10 +00:00
Tim Jenssen
1f8fccea5c qmldesigner: no need to use QString
Change-Id: Ia60a0ef4d802a87cb8b7743b678d224c83ba2234
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-23 11:51:54 +00:00
Tim Jenssen
77c3e7d2d4 languageutils: improve ComponentVersion::toString
After benchmarking it on a i7 it was 20% faster in release.
(in debug even more)

Change-Id: Ibf4599813c2e3bc206ea77dea7fc972018554b09
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-23 11:51:44 +00:00
Tim Jenssen
23ce744407 QmlDesigner: cleanup ItemLibrary a bit
Change-Id: Ib3b35e68434e94a8dde10653881fc765e449beb1
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-23 11:51:33 +00:00
Tim Jenssen
8d868d8bbb QmlDesigner: use setContextProperties
should be faster

Change-Id: I3f491237746856c00f13947dfa9e8464a2bd5c25
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-23 11:51:04 +00:00
Christian Stenger
3eb4a69b6f AutoTest: Remove some unused member
Change-Id: Iea332afc23c58aa0a3de1f3364eea519a422d524
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-04-23 11:09:21 +00:00
Christian Kandeler
925e6cb18e Remove unused members from some classes
Change-Id: I9b63bf32feaef36decc91d073eb82b2abfd2eabb
Reviewed-by: hjk <hjk@qt.io>
2020-04-23 10:41:48 +00:00
Christian Kandeler
6ad4cf4695 Debugger: Remove unused variable
Change-Id: Ib6e2c2078ff655ca2ca7c841e5f6415f0d63ef6c
Reviewed-by: hjk <hjk@qt.io>
2020-04-23 10:41:28 +00:00
Eike Ziller
49626f7ea9 CMake build: Fix devel package issues
Include paths and headers were missing for building a separator
Qt Quick Designer plugin.

Task-number: QTCREATORBUG-23778
Change-Id: Ib6ba96ad42a8b2b36e0ee2f0e3c51c27f3365d37
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-04-23 10:03:37 +00:00
hjk
2e8e30a7fa ProjectExplorer: Move build step name mapping to BuildManager
... and add some translation hints. Looks like a more natural
place to live in.

Change-Id: I3e8917d826baaa7277dde744f3843d5ab7fe0afd
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-04-23 09:26:54 +00:00
Christian Kandeler
f4f9d9cdbb Android: Remove some unused variables
Change-Id: Id6d8f0735c410a331c406a3f3a094aac5f03f5a9
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2020-04-23 09:20:17 +00:00
Christian Kandeler
03fab2cdc0 Git: Fix clang warning
src/plugins/git/changeselectiondialog.h:72: warning:
'Git::Internal::ChangeSelectionDialog::accept' hides overloaded virtual
function [-Woverloaded-virtual]
    void accept(ChangeCommand command);
         ^

Change-Id: Ia0685c2347e943687e2c0ad34b4d456a30912d0a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-04-23 09:19:59 +00:00
Christian Kandeler
548223762d Autotest: Remove "#pragma once" from cpp file
Change-Id: I686701f3a0c3d391aa50d65f88e41241111cc3cb
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-04-23 09:19:42 +00:00
Robert Loehning
43454c3fcd Squish: Update expected tree for qbs
Change-Id: I3ba303f0206db193d3e00ce52ac20f516823881c
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-04-23 09:14:08 +00:00
Eike Ziller
8984272769 Merge remote-tracking branch 'origin/4.12'
Change-Id: I296a61fe43aea134de9e7a6ee8042af3f45f5e99
2020-04-23 11:09:15 +02:00
Christian Kandeler
1c6e4fbd32 Merge output formatters and output parsers
Now only one piece of code needs to be written to both linkify output in
an output pane and create tasks for it in the issues pane.
The calling sites are also simplified. For instance, until now, build
steps had to feed their output parsers manually and then push the
created tasks up the signal stack in parallel with the actual output,
which the build manager relied upon for cross-linking the output pane
content. Afterwards, the output would get forwarded to the formatter
(and parsed for ANSI escape codes a second time). In contrast, a build
step now just forwards the process output, and task parsing as well as
output formatting is done centrally further up the stack.
Concrete user-visible improvements so far:
    - File paths in compiler/linker messages are clickable links now.
    - QtTest applications now create clickable links also when run
      as part of a build step, not just in the app output pane.

Task-number: QTCREATORBUG-22665
Change-Id: Ic9fb95b2d97f2520ab3ec653315e9219466ec08d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-04-23 08:47:08 +00:00
Christian Kandeler
2e4ed0696b CompilationDbProjectManager: Do not canonicalize file paths
In particular, we do not want to follow symbolic links, but see the file
names as they appear in the project file.

Fixes: QTCREATORBUG-23511
Change-Id: Ibf83ac143933fa0c9568dd4e3c0be825d8ba8f0b
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-04-23 08:45:59 +00:00
Denis Shienkov
b7851eeb55 Debugger: Fix breakpoint insertion stalling for UVSC engine
The UVSC support the debugger commands execution feature
using the UVSC_DBG_EXEC_CMD function. This function non-blocks
if an command execution fails. So we can use this function to
execute a breakpoint insertion command:

* http://www.keil.com/support/man/docs/uv4/uv4_cm_breakset.htm

But, to get the properties of the inserted breakpoint we need to
enumerate all available breakpoints and to find the desired
breakpoint by its expression.

Besides, we need to fix and the 'expressionBuffer' field of the
BKRSP structure according to the original UVSC API.

Change-Id: I3c52e8955de28180aaafa1af9f6001ff6ee3b7fb
Reviewed-by: hjk <hjk@qt.io>
2020-04-23 06:57:36 +00:00