Commit Graph

65382 Commits

Author SHA1 Message Date
Jacek Nijaki
08541305b6 McuSupport: Add support for desktop backend JSON file
Starting from Qul 1.5 json kit file will be shipped for desktop platform.
This change is backward compatible with previous Qul version - if no
desktop specific json file is found a legacy code is executed.

This change removes "desktop" toolchain, instead "msvc" and "gcc"
toolchains are introduced.

Additional parameter was introduced to the josn kit file: "platformName"
which enables using different strings in kit name and in QUL_PLATFORM
cmake variable.

Change-Id: Ie0a212aaad47a8033e9a81467f60a23c2bc19a51
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-09-22 08:32:00 +00:00
Eike Ziller
698a0dd8c8 Bump version to 4.13.2
Change-Id: I5566275aceb3161d04c89c6d6ef5603d8de03994
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-09-22 06:26:46 +00:00
Leena Miettinen
49d20960b9 Doc: Show "Managing Sessions" topic in QDS Manual
- Moved the topic from the creator-only folder to the
  howto folder root to have it included in the doc builds.
- Added the topic to the toc and fixed the navigation links
  around it.
- Used defines to hide text that does not apply to QDS.

Fixes: QDS-2805
Change-Id: I583324a1d0bc60c1b6448a52e48b3f09b1039b7f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-21 14:04:04 +00:00
Kai Koehne
71e2138517 Fix copyright/license of vcsconfigurationpage.cpp
The copyright and license was changed as part of the 397e7f48
mass change, arguably by erroneously copying it from
imageviewer/imageview.h or imageviewer/imageview.cpp.

Fixes: QTCREATORBUG-24620
Change-Id: I1f6a631c3b0a437af862d929a921693db367cef2
Reviewed-by: Denis Mingulov <denis@mingulov.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-09-21 12:33:35 +00:00
Kai Koehne
87cf6400fc ImageViewer: Change license of files to Commercial/GPLv3
Task-number: QTCREATORBUG-24620
Change-Id: I8c76b312d4e93346ca70eec92b8b7ac8dfa455d1
Reviewed-by: Denis Mingulov <denis@mingulov.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-09-21 12:33:29 +00:00
Christian Kandeler
781a4484a1 ProjectExplorer: Remove replacement kits
... for which the original kit has turned up again. Otherwise we'd have
more than one kit with the same id.

Fixes: QTCREATORBUG-24589
Change-Id: I7ce16615694d3d2c5a5441f676ecb7dc85c2239c
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-09-21 11:57:03 +00:00
David Schulz
da2e8bbf7b Editor: fix hanging when using invalid printer page rect
Some printer seem to return an empty page rect for some configuration
which results in an invalide page count and a freezing ui. Do not print
anything and return in that case.

Fixes: QTCREATORBUG-24110
Change-Id: I42349bc97734e3f6a67502482d2b02959e865665
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-09-21 10:18:29 +00:00
Leena Miettinen
6e4de116bf Doc: Clarify info about installing Qt Bridge for Sketch
Fixes: QDS-2809
Change-Id: I869019d347d0726911183d2014ffa0b5a66d59e3
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-21 09:51:59 +00:00
Leena Miettinen
1c26d6db68 Doc: Add OFL-1.1 to Acknowledgments
Fixes: QTCREATORBUG-24630
Change-Id: Iaaa64bb9936a80805affe992f64e24d1c586496a
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-09-21 07:49:01 +00:00
David Schulz
d99e00c49f TextEditor: allow highlightings in selections
If the selection foregound color is undefined do not overwrite the
already applied highlighting.

Fixes: QTCREATORBUG-24656
Change-Id: Ia125e8e6b9efba73d5a13facc2446a793d59f5c3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-09-21 07:16:43 +00:00
Aleksei German
7d21caabdb QmlDesigner: Minor Fixes for QDS MCU compatibility
Change-Id: I401ecf9ce12d7020e78a5449b321fb7927caffed
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-19 10:54:29 +00:00
Thomas Hartmann
bdbb0baa0f QmlDesigner: Fix range for "Fixed Frame" in Timeline settings
Change-Id: I71bdae7144ae91b9b8b8c8e2088b87310d2f4a2e
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-19 10:13:13 +00:00
David Schulz
64d0043a96 cdbext: fix mingw compile
Fixes: QTCREATORBUG-24653
Change-Id: I40071a0022be809266b98e1e898e969493b927aa
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-09-18 10:21:13 +00:00
Lukasz Ornatek
0831c07cb3 Make Translation Tests ignore imported files
Change-Id: I4abd222bd15da79a1fe14d01b8a4a1f25d935b3b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-09-17 14:50:08 +00:00
Christian Stenger
b74ec903a7 AutoTest: Fix construction of file paths for catch results
Using Catch2 on Windows with CMake lead to not having file information
as the file information was generated differently.

Change-Id: I3e0951b517a4a8a86f1ffa1009c1a2815565f3b3
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-09-17 11:35:08 +00:00
Henning Gruendl
18be09f55a QmlDesigner: Fix StateEditor show event update
Task-number: QDS-2798
Change-Id: Ic27e7491012b227e144cdae68ead8ac534cc0d5a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-17 10:10:01 +00:00
Marco Bubke
fc9ad36e40 QmlDesigner: Add GridView to ListModelEditor
We could simply test for the model property but this can lead to strange
behaviour.

Change-Id: I4e326890fb02d312b5210089c957dce026a09f94
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-17 10:08:52 +00:00
David Schulz
0198aca205 Editor: set deleteStartOfLine default shortcut on mac
Fixes: QTCREATORBUG-9219
Change-Id: I26f991641efbc914d848591931756666e34c26b7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-09-17 09:44:09 +00:00
Eike Ziller
a749b6691e Update 4.13.1 changes with last-minute updates
Change-Id: I789f4fb10c950114ed0737dcb90460d90386e2f3
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-09-17 09:29:22 +00:00
David Schulz
364288b79c Python: Fix loading working directory
Fixes: QTCREATORBUG-24440
Change-Id: I27a543f764e285acf678427cc909d2a95e5cb322
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-09-17 07:52:58 +00:00
Marco Bubke
df5e211d86 QmlDesigner: Fix compilation
Change-Id: Ia69deafa77ca234c9f80be10d19fcf582ab5e906
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
qds/v1.6.1
2020-09-16 13:24:27 +00:00
Henning Gruendl
513d1e7e02 QmlDesigner: Improve connection editor dialog
* Add ComboBoxes to connection editor dialog
* Add type toggle to dialog
* Add slots and properties to ComboBoxes
* Parse connection expression and fill ComboBoxes

Task-number: QDS-2498
Task-number: QDS-2495
Task-number: QDS-2496
Change-Id: I2cca6d4c85d1508e54d4ad8863056f22ad777ae6
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-16 10:14:56 +00:00
Leena Miettinen
a489fc18eb Doc: Add LiteHTML license and related licenses to acknowledgments
Fixes: QTCREATORBUG-24619
Change-Id: I8d28bf8a579e8885b430cd7df292f53363990ffa
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-09-16 09:30:44 +00:00
Marco Bubke
7c8847333b QmlDesigner: Go into components
Task-nubmer: QDS-2696
Change-Id: I2f0ee71deea593da08fa4a754d783b53867473ed
Reviewed-by: Michael Winkelmann <michael.winkelmann@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-16 08:37:53 +00:00
David Schulz
af88afe943 Debugger: Activate split that contains the breakpoint being hit
Do not change the current editor after hitting a breakpoint if we
already have an editor open in another split, but switch the focus to
that split.

Task-number: QTCREATORBUG-24646
Change-Id: Id85cecdfb522807bafa097e578509853326a2e31
Reviewed-by: hjk <hjk@qt.io>
2020-09-16 07:29:30 +00:00
David Schulz
e371eafd4b Editor: Calculate annotation color based on editor color scheme
Amends 9182d4eda7

Fixes: QTCREATORBUG-24644
Change-Id: Id34bfbc4ea3d1102835c7c1cf3afa1580dff01d8
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-09-16 07:20:20 +00:00
Henning Gruendl
1da2c1f766 QmlDesigner: Change RichTextEditor icon
Change-Id: I5a294e625f4ac61d15511369d7e765e05447a269
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
v4.13.1
2020-09-15 14:46:44 +00:00
Christian Stenger
745beb7634 AutoTest: Fix possible nullptr access
If the process of the test executable cannot be started
for whatever reason we will not have an active run
configuration or output reader.

Change-Id: I50146a2c8228ad39574e007ae2659465122ad20b
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-09-15 12:59:05 +00:00
Christian Stenger
7ca297cb25 CppEditor: Fix test code
Change-Id: I01073f481ebdae64c30971afd8fb332ee92e2a1e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-09-15 12:00:53 +00:00
Leena Miettinen
71ca4f4402 Doc: Fix broken external links
Change-Id: Iaf3502a8d940a5cb2eb45ee7451e834a6d4b756e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
2020-09-15 09:45:24 +00:00
Christian Kandeler
f3bd07efd1 QmakeProjectManager: Restore incremental re-parsing
This was broken in commit 37aecdd112, where we overlooked that a special
type of IDocument was used that triggers a re-parse of only the affected
part of the project tree. As a result, all changes to a .pri or .pro file
would trigger a re-parse of the entire project.

Fixes: QTCREATORBUG-24572
Change-Id: I480cff4e53cf86a17e1eaac0eb9b32901bc87051
Reviewed-by: hjk <hjk@qt.io>
2020-09-15 09:19:23 +00:00
hjk
a50f1baf5d Debugger: Change LLDB value creation hack
... to something that works with LLDB 12.

Task-number: QTCREATORBUG-24596
Change-Id: Ib2f8255d45a02fa3d2c737864994397f587e9b15
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-09-15 08:45:32 +00:00
David Schulz
bc4187727c cdbext: remove cdbdetection completely
All required header and libs are inside the Windows 10 SDK, which is
required to build with Visual Studio 2017.

Change-Id: I68ee7457041653d89e5f5c9e258f9780a417dbe4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-09-15 08:21:09 +00:00
Eike Ziller
26fc085658 Add 4.13.1 change log
Change-Id: I8e0b8f6d002c0251268aff1aeddd3470cfdee140
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-09-15 07:37:58 +00:00
David Schulz
5c76ca32ee cdbext: add option to skip cdb detection
Since a few windows sdk versions are the headers and libs of the
debugger part of the sdk installation. Add an option to sdkip the cdb
detection and fall back to use these headers and libs that are already
configured in INCLUDE and LIBS of the vcvars.bat environment.

Change-Id: If1eeecdbae34523ddbcc1a22d8640df7fa46bf6a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-09-15 06:03:45 +00:00
Michael Winkelmann
64a37ec38a QmlPuppet: Return color property
Change-Id: Icc25fb0408aae50f67633688f221194ab6f77cd3
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2020-09-14 13:45:15 +00:00
Thomas Hartmann
f641434ec1 QmlJSCheck: Fix crash
Task-number: QDS-2766
Change-Id: I4b0e81b8104ac35a286a318e87e95ea022ed66f6
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2020-09-14 12:21:49 +00:00
Christian Kandeler
d14be7493f ClangBackEnd: Support highlighting of alias templates
Fixes: QTCREATORBUG-24552
Change-Id: I80d2b16114234cf896173cd4104e6a5f12009f69
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-09-14 11:42:09 +00:00
Christian Kandeler
226982b7b0 OutputFormatter: Fix flushing a pending line feed
... for the edge case of a lone carriage return occurring in the output.
Amends b0cad9e9c7.
Also adds missing adaptations to the unit test.

Change-Id: I219b24b8fb41bb0fcea9f677cd79286d03b130c2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-09-14 10:00:03 +00:00
Christian Stenger
6ab7013579 AutoTest: Fix summary for boost
Do not take skipped tests into account when computing
passes out of the available information.
These are handled separately and may lead to a negative
passes amount.

Change-Id: I47bb1f054468dc5374d0d4e7fdeb3ad87efd0dff
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-09-14 08:56:10 +00:00
Kai Koehne
73ac5a3d87 IncrediBuild: Add plugin metadata
Change-Id: I76ea1ee35628db6c4cf87fa81d1fee49e4c0ef36
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-09-11 15:10:35 +00:00
David Schulz
3a51cdf2ba LanguageClient: avoid recursive postponed document update
Change-Id: Ibaf8831977e254c7dad10617754e763114993aee
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-09-11 11:57:34 +00:00
David Schulz
3b23cab385 TextEditor: Use selection format from the setting
Overwrites the format generated by QPlainTextEdit::getPaintContext()

Amends 9182d4eda7.

Fixes: QTCREATORBUG-24479
Change-Id: Ia226a74442dbbdbae42e8da5dee9e4d7399b677c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-09-11 11:48:29 +00:00
Christian Kandeler
a89e3e22b9 CppTools: Guard against null pointer access
... when looking up definitions of variables.
Amends a0764603d0.

Fixes: QTCREATORBUG-24610
Change-Id: I79e6f69066eaa385013e722ec4793c27231ab8eb
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-09-11 11:44:02 +00:00
Henning Gruendl
3afc21052f QmlDesigner: Fix unintentional item reordering
Fix reordering of items in the Navigator if using shortcuts on a
SpinBox in the Property Editor.

Task-number: QDS-2738
Change-Id: Ia12d2d072c36fbb32156c9729cffd828e8747b28
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-11 09:47:38 +00:00
Marco Bubke
0f9010d381 QmlDesigner: Introduce multiple node instance server
For capturing data we need a atomic mechanism. So in one
process multiple node instance server can be started and
then a command is send back that a scene is created. It
can be used to ensure that captured data of views is
up to date.

Task-number: QDS-2630
Change-Id: Iea8d0b036b6384c9c1b0f91af401f2b1f1978c12
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-11 08:57:42 +00:00
Dominik Holland
a535196c41 Add support for multiple Qt versions in "Load QML Stack"
Enable the functionality for cdb again.

Change-Id: I75405f830dd208cc110d6682a45beedf2f4199cc
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2020-09-11 08:11:21 +00:00
Andy Shaw
e35af70d98 Android: Use c++_shared for STL as cxx_shared is not correct
This fixes a parsing problem from CMake as it will state:
"Invalid Android STL: cxx_shared." This amends
01b0d4f8f5

Change-Id: I315d36eac889ba53d76055814c6b43a453e1e2f7
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-09-11 07:34:11 +00:00
Kai Koehne
90a4e8d3d0 Nim: Fix plugin metadata
The actual source files say it's Commercial OR GPLv3+Except, so
make the plugin information reflect this.

Change-Id: I867b3a27fb903719d30e32bf28418700f2c02bc5
Reviewed-by: Filippo Cucchetto <filippocucchetto@gmail.com>
Reviewed-by: hjk <hjk@qt.io>
2020-09-11 07:24:00 +00:00
Leena Miettinen
2e1eed1945 Doc: Add list to words to ignore for automatic linking
Change-Id: Idfa50889deeff64a8d97bfbb5deaf4c86a32e2bf
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
2020-09-09 12:45:19 +00:00