Commit Graph

67787 Commits

Author SHA1 Message Date
hjk
cecf3da685 ProjectExplorer: De-Q_OBJECT-ify DesktopRunConfiguration
... and move to .cpp, and sprinkle some 'final'.

Change-Id: I07054cb226afe30f6e1fd89b0518253c8b2d38d5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-13 10:00:53 +00:00
Andre Hartmann
c83a33941d Doc: Describe diffing from editor to another file
Task-number: QTCREATORBUG-17866
Change-Id: I073f998bb9a00bfcf765766b5690a9dc19209a70
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-02-13 08:24:01 +00:00
Eike Ziller
bbc3182310 Add change log for 4.12
Change-Id: I8c7c713d6b1c81cf6b3f4d944fece12b736cf82d
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-02-13 08:21:38 +00:00
Eike Ziller
ac7d072df4 Merge remote-tracking branch 'origin/4.12'
Change-Id: Ia8d26e0332721c028d942cac33a6d6de3173ba3b
2020-02-13 09:17:17 +01:00
Eike Ziller
c3911002fd Merge remote-tracking branch 'origin/master' into 4.12
Change-Id: I60aa7c97c13144d3c31989244517c21a72202ab9
2020-02-13 09:10:52 +01:00
Orgad Shaneh
f2cd459ec5 VCS: Abstract multi-choice settings in editor config
Change-Id: Iafc089f5ad3796348ab9521b71b31cb645238292
Reviewed-by: hjk <hjk@qt.io>
2020-02-13 07:58:14 +00:00
hjk
9c96a1c4de Vcs: Make VcsBaseEditorWidget::test* operate on factories directly
Saves re-discovery by id.

Change-Id: I026c1388d02f125147a9b4f5367d7a1a266bff3c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-02-13 07:10:21 +00:00
hjk
1e3b7475f6 Vcs: Remove some indirection in BaseVcsSubmitEditorFactory
Change-Id: I6ddc818412c9104a06495e2dd8f245de1132e7c2
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-02-13 06:56:32 +00:00
hjk
bbf3682c2c CMake: Connect CMakeBuildSettingsWidget only to "its" build system
Change-Id: I1259b3325d633cb89043ce65f8e33b7914f6f06e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-02-12 17:14:29 +00:00
hjk
3c436d0e42 ProjectExplorer: Introduce BuildSystem::parsingStarted/Finished
Some listeners are only interested in a particular build system
instance, not all of one target.

Change-Id: Id89bd96c1f7f68bac13886bdc31cb899978d76ac
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-02-12 16:59:29 +00:00
Christian Kandeler
e46df080ee QmakeProjectManager: Fix null pointer access
Amends c7d8b9b01c.

Fixes: QTCREATORBUG-23596
Change-Id: I466907e02572008d0e677ff29ecd712969f8bc54
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2020-02-12 16:39:01 +00:00
hjk
299d34d547 Remove apparently unneeded QtPlugin includes
Change-Id: I511c0318a72dbf2a92e4749dee02eabfc9826139
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-12 16:03:37 +00:00
Christian Kandeler
bdeedf8805 qbs build: Fix core plugin autotests
Change-Id: I1787dc66992e0484981e9c95ccaa3f4494243845
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-12 14:34:10 +00:00
David Schulz
7cba257299 LanguageClient: Print json before error message
This saves a roundtrip when reporting bugreports where an unexpected
error shows up.

Change-Id: Id2e7cbd86a456ea794f0791199077f931cab03c5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-12 11:25:10 +00:00
David Schulz
e3c7b72003 LanguageClient: introduce new type for gorgeous formatted errors
Change-Id: Ia76bd768bcb6d33ce66319dddf8cc355a41ffa31
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-12 11:25:01 +00:00
Thomas Hartmann
bf0f2ebea0 QmlDesigner: Fix assert
If in a reaction to auxiliaryDataChanged() we change AuxiliaryData
this could trigger cascades and to avoid this we assert.

The cascades and assert can be avoided by checking AuxiliaryData
before.

Change-Id: Id9dd4198041889113fb0e50fdfd4785fddf89f02
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-02-12 10:46:56 +00:00
Christian Kandeler
0d9b0f8074 QtSupport: Try harder to ensure that Qt kits have a toolchain
If we encounter a kit with a Qt version, but no toolchain, try to find a
matching toolchain and set it on the kit.
This is helpful if the user forgets to set the toolchain or a toolchain
gets removed.

Fixes: QTCREATORBUG-23564
Change-Id: I2b29ece81502b10d2a64a431a0edbcd43b1ec3a6
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-02-12 10:45:38 +00:00
hjk
8d0361a8c9 McuSupport: Inline FlashAndRunConfiguration
Add a tr() to the label.

Change-Id: Iefacd6c6646b9f5e5124d907d0516ebc5556ae76
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-02-12 10:41:03 +00:00
Eike Ziller
d43f1662d0 Make TextEditor setup more flexible
So far it was only possible to combine TextEditorFactory, BaseTextEditor
and TextEditorWidget directly.
That TextEditorWidget is also directly a QPlainTextEdit made it
impossible to "decorate" the text editor widget with something else
without a lot of effort.

Make it possible to create a text editor factory that returns an
arbitrary widget, as long as it can be "cast" to a TextEditorWidget with
either qobject_cast or Aggregation::query. That way the TextEditorWidget
instance can be attached to the editor widget via Aggregation.

Adapt other code that accesses TextEditorWidget from editors
accordingly. Introduce a common method how to do that.

Change-Id: I72b8721f3a8a8d8281c39af75253e9c80cbe1250
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-02-12 10:28:31 +00:00
hjk
783967f550 Python: Move PyLSConfigureAssistant connection to the plugin
Change-Id: I2d3aecd10d8da7e7272ebca61c0fbeacbc257bd5
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-02-12 10:09:13 +00:00
Cristian Adam
eed49de35b CMake Build: Use install component Dependencies
Fixes: QTCREATORBUG-23593
Change-Id: If9861a0ee09f2ce12ac093c2fde600a77958723a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-12 09:30:05 +00:00
Christian Stenger
6a23f644dc Android: Fix qbs build
Amends f46099d21e.

Change-Id: Idf5405a6cd571eedb0932dbba2c981f63ab59ae3
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-02-12 07:54:59 +00:00
Eike Ziller
42f02fae03 Merge remote-tracking branch 'origin/4.11'
Change-Id: Ie1c4de44aa1af20dfb67e20607b9fb4e71445cbe
2020-02-12 08:04:14 +01:00
Tobias Hunger
108ab4b715 CMake: Do not start several parsing runs in parallel
This should make the parsing a bit more robust.

Change-Id: I6a8b1758acefaf197a53a68ec4e569582765a0ea
Reviewed-by: hjk <hjk@qt.io>
2020-02-11 16:01:02 +00:00
Tobias Hunger
a7bb870321 CMake: Remove disabledReason
The current implementation does not help the user and is not in sync with isEnabled(),
so it is not helpful to have.

Change-Id: Iddde1ac3da24d50e8a16d2bd4c6aa56eef34ef50
Reviewed-by: hjk <hjk@qt.io>
2020-02-11 15:58:06 +00:00
hjk
570b13de15 Nim: Simplify NimbleRunConfigurationFactory
Left over from earlier infrastructure that isn't used elsewhere
in this form anymore.

Change-Id: I785f95d668743ccee858b4d02a2215c895cb55c4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-11 14:44:18 +00:00
Leena Miettinen
5997f9754d Doc: Add a note that qmltooling plugins are required for QML debugging
Task-number: QTBUG-82039
Change-Id: I042b8212e3571b806e9a35b12fa83cc84006b2e6
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2020-02-11 14:42:17 +00:00
Assam Boudjelthia
e50c744710 Android: use QDir::mkPath() instead of QDir::mkdir() in SdkDownloader
Allow creating nested dirs path.


Change-Id: I38106c148b177e5af06a59dd624ee74e2db1df40
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-11 14:30:35 +00:00
hjk
c570d6469d Debugger: Move PerspectiveState registration
... to DebuggerPlugin ctor. This fixes a "Variant::load: unknown users
type with name Utils::PerspectiveState" message when the TextEditor
plugin restore the FontSettings.

Change-Id: I8e1ebe562233ff6e9b7bdbfa85680e5acf6c4715
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-11 14:27:19 +00:00
hjk
713cdb86a0 Core: Remove QObject parent for IEditorFactory
Change-Id: I0b2088c56a86b8c68bbb355d367d062475685063
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-11 14:09:12 +00:00
David Schulz
67aef33dd0 Editor: reapply font settings after palette changes
Change-Id: I99368b03e093794656cf7a69aa9ef75032c430eb
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-02-11 13:21:33 +00:00
Leena Miettinen
87b2107290 Doc: Describe the Telemetry plugin
Fixes: QTCREATORBUG-23586
Change-Id: Ie0bd470dcf3cc23d401219d0a83f4179a4948acf
Reviewed-by: Vitaly Fanaskov <vitaly.fanaskov@qt.io>
2020-02-11 13:19:52 +00:00
hjk
82e8ceab8b Debugger: Use some more verbose description for attaching to remote
Change-Id: I36e9793b1db98b538455c8d6075e8116a5af14bb
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-02-11 13:12:16 +00:00
Assam Boudjelthia
9645906ae2 Android: don't show Android info bar if Android version is installed
If no Qt for Android version is installed don't show the config info
bar.

Fixes: QTCREATORBUG-23580
Change-Id: I880594701cdd6d5c0fc0586b5e49cc6a66efedb7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-11 12:51:26 +00:00
hjk
f4769d7931 QmlProjectManager: De-export QmlProjectRunConfiguration
Change-Id: I728c4f40f9cc4b559e18fcef10289eddcd5e87bf
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-02-11 12:39:15 +00:00
Miikka Heikkinen
1d71e6ac17 QmlDesigner: Store tool state on per-scene basis
Tool state of the scene is linked to qml id of the scene root, so that
tool states are preserved through delete and undo, which causes
generation of new internal ids for instances.

Tool state storage doesn't currently survive changing of scene root
qml id, as tracking that isn't trivial. It's not enough to simply track
id change commands because model repurposes existing nodes when major
graph changes occur, causing unexpected id changes e.g. when
delete/undo is done.

Change-Id: I74d11ce47e86ce5d29796399c4a91b65980b1597
Fixes: QDS-1536
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-02-11 12:13:24 +00:00
Knud Dollereder
841f5be97e Implement locking and pinning of animation-curves
Fixes: QDS-550
Fixes: QDS-551
Change-Id: I53a120a3753bb98fe729106b7e996f475fbda2f1
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-02-11 12:13:00 +00:00
Robert Loehning
debc304bf8 Squish: Update detection of configured kits
Change-Id: Icade1feffde4a1b252175d8012c411a0a423748f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-11 12:04:26 +00:00
hjk
aba3777568 Core: Move GeneralSettings to new scheme
Change-Id: I48a153619836e4dc0d87af56ce8e32eec0e552f8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-11 11:50:46 +00:00
Eike Ziller
0e0c0185d2 CMake build: Put wininterrupt and cdbextension into separate components
And make it possible to turn off building the cdbextension library.
So they can be installed and packaged separately

Change-Id: Ic7da1411aa3973604b897e1cbf57ad9c5b0fe460
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-02-11 09:40:19 +00:00
Assam Boudjelthia
2555f4b8dd Android: Fix UNINIT_CTOR and PASS_BY_VALUE issues
Change-Id: Ie77e69226769d9ea0440611f2f5985c5ec08beaa
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-02-11 08:52:48 +00:00
Mahmoud Badri
159c82802b QmlDesigner: Maintain grid size while zooming
Task-number: QDS-1622
Change-Id: I488b78304866b40b16d17d643816aa899ccb4cd9
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2020-02-10 21:47:06 +00:00
Christian Kandeler
a12d3721c0 QmakeProjectManager: Fix access to deleted object
Amends c7d8b9b01c.

Fixes: QTCREATORBUG-23576
Change-Id: I7de6679f3dd5ba950561d560195e5af5bfaf90a5
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-02-10 16:13:58 +00:00
hjk
919571e955 Android: Avoid one use of Target::activeBuildConfiguration
A build step knows where it belongs to.

Change-Id: I990cf1fb7f22b608a2f317a05b05f1219649aa6e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-02-10 15:57:34 +00:00
David Schulz
e85d6b363b Editor: Improve splitting format range performance
Instead of copying the list and move some items individualy from
one list to the other use Utils::partition.

Fixes: QTCREATORBUG-23281
Change-Id: Iaf9430c041aa916feecf9214303ba30f17290ba8
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-10 14:09:38 +00:00
hjk
9c934ed44c TextEditor: De-QObject-ify TextEditorActionHandler
Change-Id: I8c4919b89ce35d421edd4a21a650d5e0df4a7ead
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-02-10 13:54:39 +00:00
Leena Miettinen
e12ba2d683 Doc: Fix broken links in Extending Qt Creator Manual
- Move some images from qtcreator\images to qtcreatordev\images
- Hide directories from the doc build (these will be added
  gradually when we fix the docs for the classes in them)
- Fix broken links
- Add README.md that describes the doc projects in the repo

Fixes: QTCREATORBUG-23544
Change-Id: I4fc29d8fbc8b7a0a0f81fa3261f6412c47b9d84e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-10 13:40:43 +00:00
David Schulz
4ebf6981db Editor: Update viewport margin if extra area width differs
Change-Id: I305bde817f70ac4b84054d04170700ef10f090cd
Fixes: QTCREATORBUG-23238
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-10 13:40:32 +00:00
Eike Ziller
c522ceb7dd macOS: Do really deep deep code signing for notarization
Notarization is more picky than the regular code signing.
All code outside of the "usual" binary directories must be signed
separately, in addition to being codesigned with the application
afterwards.
That includes Imports/qtquick2 and Resources/libexec.
We cannot just move these into e.g. MacOS/ or PlugIns/ either, because
these directories may _only_ contain code, no other resources.

Change-Id: Id05b2644e01b61e9c33d86617c6374225b50e7f3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-10 13:04:39 +00:00
Leena Miettinen
770b2f1bc6 Doc: Fix PreprosessorClient docs
Fix values of \fn commands and document attributes.

Change-Id: Id09eb30e861289e9d982d7e0f914c68114ecf50c
Reviewed-by: hjk <hjk@qt.io>
2020-02-10 12:34:18 +00:00