Commit Graph

67787 Commits

Author SHA1 Message Date
Thomas Hartmann
5ac3f2958f Add StyleHelper functions for icon font
Change-Id: I783f3405dafbd51bf7433084709a2362ed2bd759
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-27 13:27:26 +00:00
Christian Kandeler
b7980253a9 ProjectExplorer: Fix the "unload while building" case
This probably broke in or around 966f4ea6a9.

Change-Id: Ib61f181558b0ebeb17d6b52798af80b7307cac41
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-04-27 11:40:31 +00:00
Christian Stenger
1cea268c92 QmlJSEditor: Fix semantic highlighting
Do not send empty ranges as they may mess up the
highlighting of the file.

Fixes: QTCREATORBUG-23729
Change-Id: I77adcccb3a3da890e87f0b2860b945819446a3a8
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2020-04-27 11:28:33 +00:00
Thomas Hartmann
4435a19979 QmlDesigner: Add Combo box for states
Change-Id: I91494e297cc2c1aa4b192081b5cd31acbca87ce9
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-27 11:21:14 +00:00
Vikas Pachdha
f2b9bdd9f2 Fix QML designer item library crash
Task-number: QDS-2011
Change-Id: Ibf0c6db47eb25b730bc31fc7b52b0ec93ab15a63
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-27 10:32:53 +00:00
Alessandro Portale
db0d7a2669 McuSupport: Make some functions in McuSupportOptions static
There is no good enough reason to have them non-static, and upcoming
changes will have it a bit easier with static calls.

Additionally, make McuTarget::m_toolChainPackage const.

Change-Id: I002d5d56606d3b43c4c7a2f63c59e97a81342c69
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-04-27 10:26:36 +00:00
Alessandro Portale
5795ce2aae McuSupport: Remove outdated Qt for MCUs kits
Add a version to the generated Qt for MCUs kits. That version will
increase with every change to the way Qt for MCUs kits get generated.

If there are auto-detected Qt for MCUs kits with a different version
than the current, remove these kits when a "fresh" gets generated.

Task-number: QTCREATORBUG-23891
Change-Id: Iafcd2342d458f9c77ada47180cb61b3b4b090598
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-04-27 10:26:23 +00:00
Christian Kandeler
ab840d0043 Doc: Fix description of how to get to global "lib search path" setting
Change-Id: I7598f91a77c27578f1e6b106f6ae9b0f84481746
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-04-27 09:10:02 +00:00
Christian Kandeler
2b6ce6cea5 Fix display of some file paths on Windows
In particular, the "executable on host" field on RemoteLinux & friends
had the wrong separators.

Change-Id: Ic36d73e863c78dcefd5c670537dd7c86b081d173
Reviewed-by: hjk <hjk@qt.io>
2020-04-27 09:06:13 +00:00
Henning Gruendl
104852e09d QmlDesigner: Update properties in property editor
Add missing and cleanup existing properties in property editor.

Task-number: QDS-1502
Change-Id: I7bff7bad32b3bfd0742dd1d06f7c3ba12ef1bbca
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-27 08:47:57 +00:00
Thomas Hartmann
9c17fd0dbe QmlDesigner: Extend icon font support
* Use ADS::IconProvider to make use of font icons
* Add support for IconProvider in FloatingWidgetTitlebar
* Add support for named font icon entities in QmlDesigner::Theme
* Add level of indirection to Constants.qml to be able to parse it
  from inside C++
* Add color and HighDPI support in stylehelper
* Update icon font and related constants

Change-Id: I31ac33917d2db002697ce63f50f5c181c5fdb103
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-27 08:47:31 +00:00
Denis Shienkov
d7867987ce BareMetal: Add support for Nordic Semiconductor devices in UVSC provider
This patch adds support for Nordic nRFx ARM devices family.

Tested with J-Link debugger using the PCA10040 development
board which contains nRF52832 chip.

Change-Id: Iabcdd1c9678b631b58c56bf067f400324ec1915f
Reviewed-by: hjk <hjk@qt.io>
2020-04-25 20:52:17 +00:00
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
Henning Gruendl
92c7662acb ADS: Integrate newest base repository commits
998fe9fa11939eb28dd021ca11d5302c4fe2a005
28dc374fc25fcf5a4100c7ad929cb8da690530ed
0e88467f94194d5bea209f6ddc364358ab92899e
d0f4ce324890197683869eafda0f3938ae619b8d
c541f2c69b519eceb76ffc54589175c9fd0da8a6
37d305e50d2c0829f031b71a61e290361eea9f07

- Fix/workaround for escape key issue with remaining overlays
- Clean up if statements according to style guide

Task-number: QDS-1883
Change-Id: I44ddaed67458a75aca91bdd74cd2b5890bd23c38
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-24 11:48:32 +00:00
Tim Jenssen
7554f89c71 Merge remote-tracking branch 'origin/qds-1.50' into qds-1.59
Change-Id: I45983a470a275f7eb173ed4ce34a2350e23cc625
2020-04-24 13:47:50 +02:00
Thomas Hartmann
d5ac552314 QmlDesigner: Fix ComboBox for raw strings
Change-Id: Ie35bda95290042f2faaf938ee67b6ee02e8c55b1
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-24 11:42:13 +00:00
Eike Ziller
ae080facf5 CMake build: export less generic public includes
Do not put every plugin's and lib's source folder into public includes.
We require includes of the style <somelib/foo.h> and <someplugin/bar.h>
if someone depends on somelib or someplugin.

Change-Id: I3a9f200b7c3879cf431b00a1bab4a70f7aa0a9ec
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-04-24 11:40:51 +00:00
Thomas Hartmann
0222630012 QmlDesigner: Add fontStyle support
Task-number: QDS-1884
Change-Id: Ifb3ec8cf92668adb2e4e5f01e0e0b2403eb4cbac
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-24 11:35:28 +00:00
The Qt Project
dd0a195f0c Merge "Merge remote-tracking branch 'origin/4.12' into qds-1.50" into qds-1.50 2020-04-24 11:34:38 +00: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
Thomas Hartmann
88e07d8a7a QmlDesigner: Implement transition tool
Implementing a custom tool to create transitions in flows.

Change-Id: I721895c67084707bea8504c657ec9af2b5df2c22
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-24 11:32:17 +00:00
Thomas Hartmann
8c50ceb294 QmlDesigner: Add setStartFlowItem
Change-Id: I6ad377bcca4e1db84a802909c1b5d8b9ccfe5a14
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-24 11:26:21 +00:00
Leena Miettinen
aad05dde54 Doc: Fix links in Qt Design Studio Manual
Change-Id: Ie5a218fcdb8ed4823ce8caac655cc3081236f07f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-24 11:23:59 +00:00
Christian Stenger
ac7283acee QmlDesigner: Further fixes for gcc5.3
Amends 8d868d8bbb.

Change-Id: Ifad7a5d9aa85cf076e2e42ac9489c01dc8995fcd
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-24 11:20:14 +00:00
Tim Jenssen
93ef6afff9 Merge remote-tracking branch 'origin/4.12' into qds-1.50
Change-Id: If491fa41c07b9159d1755ef0580b4af6f6ca7d65
2020-04-24 13:17:03 +02:00
Thomas Hartmann
49cfa2d050 QmlDesigner: Move flow effects to submenu
Change-Id: I2afdcc5068501b7b29543228668b543b0b68a4d1
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-24 11:16:17 +00:00
Thomas Hartmann
14b86100b5 QmlDesigner: Add action for setting initial FlowItem
Change-Id: I23170f08b45a9560c3d6cae6f6d56396de9aab8b
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-24 11:11:06 +00:00
David Schulz
f71286db98 Debugger: evaluate expression before assigning when using python dumper
Fixes: QTCREATORBUG-23711
Change-Id: Ic386b3e4bdd948e74f52116248de1b33a35fe03a
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-04-24 10:58:07 +00:00
Miikka Heikkinen
5578a79953 QmlDesigner: Fix crash on some operations when done on 3D nodes
Added a node validity check on some operations that convert ModelNode
to QmlItemNode.

Change-Id: Ia60aaa2df71db9fd0e7edbbde11e7f8b11559aa6
Fixes: QDS-1894
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-04-24 10:53:49 +00:00
Thomas Hartmann
f057adcff2 QmlDesigner: Delete all bindings to deleted node
When a node is deleted we should remove all bindings to that node.

Change-Id: I3a6c3387c535ac8c79bfc83671614ed8abd246a5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-24 10:46:36 +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
Miikka Heikkinen
d1a7afa28f QmlDesigner: Add "closeup" option to focusObjectToCamera function
The closeup option is used for itemlibrary thumbnail generation, where
the regular fit produces too small images on most imports.

Change-Id: I2901a2e20d100b155111f002b22489df945e9e01
Fixes: QDS-1899
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-04-24 10:29:43 +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
Aleksei German
742d2d7086 QmlDesigner Timeline Onboarding text
Change-Id: I06e3c357ec257b33b51c9d4c6a62fd7ebdc107fb
Task: QDS-1890
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-24 09:47:04 +00:00
Miikka Heikkinen
a248138685 QmlDesigner: Make 3D edit view onboarding text translatable
Also add a potential related nullptr check.

Change-Id: I8c6e4facbdb0c2d94f7c2af54f83eef0eca0b796
Fixes: QDS-1993
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-04-24 09:35:04 +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
Miikka Heikkinen
923bd79323 QmlDesigner: Don't expand the selected node on selection change
Point of expanding items at selection change is to ensure the selected
item is visible. It is not necessary to also expand the selected item.

Change-Id: I2435daf4845b5066ddb41a4aeae71d66e12fd94d
Fixes: QDS-1940
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-04-24 07:34:23 +00:00
Miikka Heikkinen
51993ea62d QmlDesigner: Fix import removal issues
Fixes the issue of removing all versions of import when one is
removed via item library. Also fixes a bug in item library that
allowed removal of used imports in some situations, such as directly
after another import was removed.

Change-Id: I0ad879c8be708873b716fe6326655bcbc66a566a
Fixes: QDS-1989
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-24 07:34:08 +00:00