Commit Graph

63480 Commits

Author SHA1 Message Date
Leena Miettinen
b18587742f Doc: Describe downloading Qt Bridge from Qt Marketplace
Adjust the info about exporting and importing assets.

Change-Id: Ibc66fac68e14483fda050b7501fc7e091115ce89
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-05-04 06:56:22 +00:00
David Schulz
09b69b274d Debugger: Fix crash after adjusting font size
Change-Id: Ic3b415a3791968f972d2f69ec71c8012c572995d
Fixes: QTCREATORBUG-14385
Reviewed-by: hjk <hjk@qt.io>
2020-05-04 04:22:56 +00:00
Thiago Macieira
0bd53651d4 Fix compatibility with Qt 6 QMutex's non-recursive
QMutex in Qt 6 cannot be recursive. So don't call the constructor to pass the
option that isn't needed.

Change-Id: I9709abb1c3734e10a7defffd1607e76745b5cf0a
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-04-30 16:58:11 +00:00
Brook Cronin
96cd1bffae Theme: add controls theme to creator themes and map to controls theme values
Change-Id: Iec6f217e8d3ae6e7f72fdf86c282e1b11b225626
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-04-30 15:43:45 +00:00
Eike Ziller
d7520dece5 CMake build/Linux: Install desktop and appstream files
Fixes: QTCREATORBUG-23906
Change-Id: I9d796c8826dbb4beb980aa29b75526fe96093921
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-04-30 07:06:20 +00:00
David Schulz
7d429c54e3 Debugger: remove unused variable
Change-Id: I7cddb9cd8ec3b058e04409e6a56490297660ed03
Reviewed-by: hjk <hjk@qt.io>
2020-04-30 06:23:53 +00:00
Christian Stenger
626807c94e QmlJS: Fix line number for string literals
When a string value's first line ends with an EOL the
line number for the next line got wrong which in turn
confused the syntax highlighter.

Fixes: QTCREATORBUG-23777
Change-Id: I37eed839a2e63cf470b9bc2ac0596ab8bc8d373c
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2020-04-29 16:09:08 +00:00
Eike Ziller
5feec21cbd Packaging: Install documentation
Fixes: QTCREATORBUG-23912
Change-Id: I2e28c9f9000dca1216ec31bad307031937223e83
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-04-29 14:25:58 +00:00
Christian Stenger
549b5719f6 QmlJS: Fix lexer handling of escape sequences (again)
The lexer handled escape sequences already, but not fully
correct.
This effectively reverts 63db0f271f and fixes the wrong
offset.

Task-number: QTCREATORBUG-23830
Change-Id: I2cc1e9df5c0218cf9ee80998adce69bbc2eb4dab
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2020-04-29 13:48:11 +00:00
Christian Stenger
8806ae3bdf AutoTest: Fix output handling
Connect to the correct signal to explicitly react on
output coming on stdout.
Necessary as we are changing the read channel while
processing output.

Fixes: QTCREATORBUG-23939
Change-Id: Ibf62de62fb64bd9c2395f93643e39d11d5b4e0d5
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-04-29 10:30:52 +00:00
Vikas Pachdha
662c224bab Fix crash with sorting library items
Strict weak ordering relation for the comparison was not followed.
Using shared_ptr and removing QSharedData. The entry data is shared
between instances

Task-number: QDS-2011
Change-Id: Idfcd23b2d458f9c7cada47180cb6ab3b4b090416
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-29 08:37:07 +00:00
Thomas Hartmann
c01fef0a78 QmlDesigner: Fix bindings in metainfo file
Since the parser update the string
is not escaped anymore.
Which to me is the more correct behavior.
We have to remove the escape characters
ourselves.

Task-number: QDS-2019
Change-Id: I5d03e99ab87b27bfcb22170138b96e50f646e5e4
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-29 08:36:00 +00:00
Venugopal Shivashankar
91f696b3f3 Doc: Fix the new project template's group name
Task-number: QTCREATORBUG-23858
Fixes: QTCREATORBUG-23858
Change-Id: If4493b9c5e3b017097c52797f14f3bc507275e61
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-04-29 08:33:44 +00:00
Thiago Macieira
4259772314 Fix deprecation against QProcess::start splitting overload
Change-Id: I9709abb1c3734e10a7defffd1607e6d198bbf964
Reviewed-by: hjk <hjk@qt.io>
2020-04-28 18:45:09 +00:00
Eike Ziller
05f746cfd0 Add script for building external plugins for packaging
Also turn off PCH for building Qt Creator and add some more options for
local testing.

Change-Id: Ic05099ef1dd8e8c78b174d7cd07a83b2f4a9cbb5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-04-28 11:21:19 +00:00
Leander Schulten
794f3a5f55 DoxygenGenerator: Ignore attributes in declarations
Otherwise the doxygen generation will not work.

Change-Id: I07889d84c179ec0ad931d9790f9270ebbd6d259d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-04-28 09:41:49 +00:00
hjk
1352ec636f Debugger: Simplify 'long long int' to 'long long' in display
This also fixes the StdMap test case with LLDB 9.0.0

Change-Id: I0e4580b7e64d62664a81fd75a5e142717bf3563a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-04-28 09:14:07 +00:00
Alessandro Portale
185f03cb33 McuSupport: Identify existing Kits for MCU Targets via meta data
... instead of just by kit name.

Although the Kit name is quite verbose, it is missing some of the
information needed to realiably identify Kits for MCU Targets. Use the
Kit meta data for that, instead.

This adds the color depth to the kit meta data.

Change-Id: I39bc9a681a423a4309290b0f47298dbcb83b2e54
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-04-28 08:51:41 +00:00
Eike Ziller
fc94174bf7 CMake build: Fix copying & installation of resources
- just copy & install whole directories, like the qmake build (basically)
- copy & install scripts/ only on macOS
- do not copy or install welcomescreen/ which is no longer used

Fixes: QTCREATORBUG-23907
Fixes: QTCREATORBUG-23909
Fixes: QTCREATORBUG-23911
Change-Id: I0f9016848d15b214c40f454f39c5560d1faa4f32
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-04-28 08:50:51 +00:00
Jeremy Ephron
7982c440d5 Debugger: Fix STL map size bug on Windows
Fixed a bug in obtaining the size of STL map with MinGW 32/64. Retrieved
the size directly rather than unpacking the size from the data (which
is not present in on Windows). Tested for compatibility with LLVM/LLDB
on macOS.

Change-Id: I4d836d6288465e82d694de0405965586683c1355
Reviewed-by: hjk <hjk@qt.io>
2020-04-28 08:25:04 +00:00
Cristian Adam
5dfdeec389 CMake: build fix for unittests
Change-Id: I1ead13e7b764a346ac49004ead2bf9ab6362ffb5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-04-28 07:10:11 +00:00
Eike Ziller
106e0430ed Bump version
Change-Id: Ieb662d20d5bba2e410039bcdeb2459129601187a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-04-28 06:11:58 +00:00
Thomas Hartmann
0a240be6bf QmlDesigner: Fix SelectionContext::hasSingleSelectedModelNode
This one should use AbstractView::asSingleSelectedModelNode.

Change-Id: I6bddd62866d50cbda087924bf55446b6cd087085
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-27 13:31:41 +00:00
Thomas Hartmann
cef36248ee QmlDesigner: Fix crash
Since we call updateItemSelection via a timer, there is
no guarantee a model is attached.

Task-number: QDS-1939
Change-Id: I37bf40cf3d6a057a8bc695d0d0ec73b6cf17fdb5
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2020-04-27 13:30:50 +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
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
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
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
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
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
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
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
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
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
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
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