Commit Graph

62421 Commits

Author SHA1 Message Date
Christian Kandeler
a33b37bfaf ClangCodeModel: Restart clangd on "internal" changes to non-open files
Our previous "openExtraFile" approach does not reliably trigger re-
indexing.

Task-number: QTCREATORBUG-26521
Change-Id: Ibb4008d9cc72afddf6709c6f9442426440b72d01
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-09-14 08:00:31 +00:00
David Schulz
6bc66a0a90 Locator: add and use default shortcut and default search text
Change-Id: I98de37be052f367c52fa248370eaacd83f90e969
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-09-14 07:58:08 +00:00
Eike Ziller
9d745e0f53 ClangCodeModel: Fix compiler warning
Change-Id: I68648ffe4ae3aa8bdfdf2706c1a65eb2269eaa1f
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-09-14 07:57:56 +00:00
Christian Kandeler
42121845cb ClangCodeModel: Add missing notification after symbol renaming
Task-number: QTCREATORBUG-26521
Change-Id: I3f3e25f4c28bc454f66bbd730e172833be8f87e4
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-09-14 07:44:25 +00:00
Christian Kandeler
8beeea5b5e CppEditor: Add support for showing pre-processed source files
Fixes: QTCREATORBUG-4
Change-Id: I819709e69e604849264e745da98065829f7cb228
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-09-14 07:42:49 +00:00
Christian Stenger
0867d6f6a5 QmlDesigner: Fix build
Change-Id: Ic12c886e72b9ba9b9987398a7c97e5c4df404aaf
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-09-14 04:24:51 +00:00
Jarek Kobus
f9522051f7 testFileTransfer(): Add more checks
Make the target path more nested.

Task-number: QTCREATORBUG-28151
Change-Id: Iae0660294d873e82e3fef0cbf2411f7c22ef526f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-09-13 15:31:25 +00:00
Marco Bubke
40aa1eee06 QmlDesigner: Reactivate coretests
Change-Id: Ia4b6b4b6cd25ad4bb5ff0e0a7c5629af2f5ed6db
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-09-13 14:13:12 +00:00
The Qt Project
25fb238e92 Merge "Merge remote-tracking branch 'origin/8.0'" 2022-09-13 11:14:21 +00:00
Alessandro Portale
02ac16128b ProjectExplorer: Fix directories as filesource in JsonWizard
In addition to file names, Json wizards can define directories as
"File" source. That triggers a specialized code path which broke
with the conversion to using Utils::FilePath.

Amends: 389b1eceb9

Change-Id: I17be01dd04f3fe053966a87e16882659e341da5e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-09-13 11:13:01 +00:00
Miikka Heikkinen
e15d834601 QmlDesigner: Create 3D models at the point of context menu trigger
Fixes: QDS-7640
Change-Id: I2f178c2e2661dedc4efe23b675363283e3cd3bc3
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-09-13 10:15:34 +00:00
Henning Gruendl
fbb9dd1647 QmlDesigner: Allow multiple StateGroups in .ui.qml
Change-Id: If7f626f196899ebd49e5f6393d8e3ef81447945c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-09-13 10:05:23 +00:00
Eike Ziller
5ae23f8c66 Merge remote-tracking branch 'origin/8.0'
Conflicts:
	.github/workflows/build_cmake.yml
	src/plugins/qmldesigner/components/connectioneditor/dynamicpropertiesmodel.cpp
	src/plugins/qmldesigner/components/materialeditor/materialeditorview.h
	src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp
	src/plugins/qmldesigner/designercore/model/model.cpp

Change-Id: I111b9140375b894a5487cc012b17cc32100bdb8d
2022-09-13 11:15:16 +02:00
Antti Määttä
1b688b51fd Optimize TimelineModelPrivate::incrementStartIndices
Reduces the overhead of the function by a factor of ~500(depending on
the event count) by having the Range(start) index to the RangeEnd so
that we can only increment the RangeEnds that actually
need to be incremented.

Fixes: QTCREATORBUG-28162
Change-Id: I9daa711d0a1d960b232c5ed30564271daa68d1aa
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-09-13 09:00:53 +00:00
Christian Kandeler
f7efefb6d4 ClangCodeModel: Support setting additional preprocessor directives
... for a document.
This was only ever implemented for the built-in code model.

Fixes: QTCREATORBUG-20423
Change-Id: Ia99d0136e9995a5626058ad06173ea077be024d8
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-09-13 08:14:28 +00:00
Christian Stenger
fbd4775f89 Squish: Add some logging
For better keeping track of what is happening add logging
for the states of the server and runner.

Change-Id: I6666ce5bdcfb0c2ab1b05758ad293e2169dee0a3
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-09-13 07:58:48 +00:00
Christian Stenger
61effdff7a Squish: Fix painting location marker
Change-Id: Id0b36fe2c0b960a63415445b2e718688ea129da0
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-09-13 07:58:41 +00:00
Christian Stenger
0d7bbb8480 Squish: Avoid crash
The SquishControlBar becomes unexpectedly parent of the
critical error message box.
If the runner stops e.g. with a broken connection to the
server due to license issues the stop triggers a shutdown
of the server which in turn destructs the control bar, but
this crashes due to the message box.
Use the "real" main window instead which also corrects the
positioning of the message box.

Change-Id: I8ec3a100a51761169d8820175196dfc84b092410
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-09-13 07:58:35 +00:00
Christian Stenger
cc3ec2dab8 Squish: Separate state handling
Different runner modes get different handlings, so reflect
this in code and have easier maintenance.

Change-Id: Ia879a0e2db1d99dd50e43dfbe439dc6d679d7da6
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-09-13 07:58:29 +00:00
Marcus Tillmanns
2f0a26c1f5 Filepath: Revert "root"
Change-Id: I3f8e8d8eb32f4e3246942aad2f1205034bfafc07
Reviewed-by: hjk <hjk@qt.io>
2022-09-13 07:58:04 +00:00
Knud Dollereder
67408ac183 Add tooltips to the timeline settings dialog
Using the suggestions from the bugreport.

Fixes: QDS-7109
Change-Id: Iedf991958525d793f89e3d591f978a19d53a39bd
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-09-13 06:56:31 +00:00
David Schulz
e0f7b096d3 Core: replace menu bar locator filter with actions filter
And also collect global actions from the ActionManager.

Change-Id: Ia22374a709a0cb15b314d33009e15562d226cc7b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-09-13 06:37:41 +00:00
Alexander Akulich
2054dc8169 ClangdSettingsWidget: Enable word wrap for a long help label
Change-Id: Ia96b73fb2dded58fb824b401c0cf94e8ef5a5664
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-09-12 20:36:56 +00:00
Florian Koch
69fad91660 Re-introduction of the feature to adjust the line spacing
This already has been implemented in change
dc64f3207b, but was reverted with
change f220cb0e23) because this does not
work with text wrapping rendering, due to internal limitations of Qt.
Since this is a highly requested feature (e.g. QTCREATORBUG-13727), but
an internal change within Qt is not in sight, the approach taken here
is to offer the text wrapping feature in the settings only when the
line spacing is set to 100%. Additionally, a change has been made to
the layout of the display settings page to reflect this.

Fixes: QTCREATORBUG-13727
Change-Id: Ib233cf90a5f336bc591fa1bf860e162fa774dfe3
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-09-12 16:40:15 +00:00
Miikka Heikkinen
0f2ade49f9 QmlDesigner: Set material preview aux values asynchronously on init
This is done to avoid recursive writes to model.

Change-Id: Ie7cdd9c38fc54276a2c6617ba51137fd78946f4a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-09-12 15:20:26 +00:00
Marco Bubke
da5a6b4cfb QmlDesigner: Extend ModelNode::auxiliaryDataWithDefault
You can now use AuxiliaryDataKeyDefaultValue yo provide a default value.

Change-Id: Idfbc74489f6a3f60a70a3e2cdaa93ad71b536e95
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Aleksei German <aleksei.german@qt.io>
2022-09-12 14:50:32 +00:00
Miikka Heikkinen
a2c8972ce1 QmlDesigner: Expose dynamic texture and vector properties in components
Provide editor templates for Texture, TextureInput, and vectorXd
type dynamic properties exposed by components.

Change-Id: Ie7ae62aeffc5e151a1300b3aefdfc68584ccda6a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-12 13:57:25 +00:00
Alessandro Portale
74f5ad6583 Utils: Unify and simplify Details(Button|Widget) and ExpandButton
This replaces lots of custom painting/animating code with a simplified
implementation and cross-platform visual unification.

Task-number: QTCREATORBUG-27801
Change-Id: I18b12e8c7f0bba4ba5d8a05271ab1e757769dc5f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-09-12 13:43:43 +00:00
Thomas Hartmann
c1bc770564 QmlDesigner: Reset dynamicPropertiesModel on state change
Change-Id: If503d0d4f5cb3d23c4445fa6e774729779d4dd5b
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-09-12 13:30:45 +00:00
Christian Stenger
4e88a8a6f7 Squish: Redo state handling
Separate states and modes according to their use.
Remove state handling from perspective, let tools switch
the perspective mode, and reflect perspective mode
immediately on the perspective.

Change-Id: Ibb0338974b90fcc099517c13d685f800d9774a7d
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-09-12 12:30:51 +00:00
Eike Ziller
2456f8f568 Convert file search API to FilePath
Fixes: QTCREATORBUG-28135
Change-Id: Iec8fcbae40adcccbe775de5719a657f5aa30a941
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-12 12:24:48 +00:00
Eike Ziller
2c51e4bc17 FilePath: Return optional bytearray for file contents
For differentiating between "error" and "empty file".

Change-Id: I2c019ceac625e7be3180afa4d47ae3a24df91c1d
Reviewed-by: hjk <hjk@qt.io>
2022-09-12 11:57:04 +00:00
Jarek Kobus
1df6806e0b GenericDirectUploadService: Check exitCode when handling failure
Task-number: QTCREATORBUG-28151
Change-Id: Ib61959ce792208edb1acb5cf1131e34c248cd795
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-12 11:51:44 +00:00
Christian Stenger
28349c1b08 McuSupport: Fix tests
Change-Id: If8d8f00bef3ebf163f59036661e6b99be9b3e2ec
Reviewed-by: Piotr Mućko <piotr.mucko@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-09-12 10:30:38 +00:00
David Schulz
57f80dc813 Downgrade Source Code Pro font
The old version looks crisper. Downgrade to
Roman fonts version 2.030 and Italic fonts version 1.050

Fixes: QTCREATORBUG-28106
Fixes: QTCREATORBUG-28139
Change-Id: Iec077fddf2ddba71b8b2cd7de92f397e12b6dc65
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-09-12 10:17:09 +00:00
Robert Löhning
11ea9fde23 Remove outdated version checks
Change-Id: I972a7fe0842a0310ba5df1233a4f417627dad87c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-12 08:44:49 +00:00
Knud Dollereder
b3359f28a6 Use Mouse wheel and ctrl to zoom the curve editor
Change-Id: I85001a2173e69887f72c2e0b366861e0753dd8a3
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-09-12 08:24:25 +00:00
Marcus Tillmanns
ffe71ddba6 Utils: Make assert output standard conformant
Most IDEs support the "filename:linenumber" format to create shortcuts
to locations in code. This changes QTC_ASSERT() to output this format,
to make it easier to understand the reported issues.

Change-Id: I74f3f121c04ba262628ab73c457fa3e5fa760a04
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-09-12 08:21:24 +00:00
Thomas Hartmann
0192cef3bb QmlDesigner: Make DynamicPropertyRow::commitValue state aware
Change-Id: I2f6d93be6fe1f92637902138ac9f073f18f1af22
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-09-12 06:51:38 +00:00
Thomas Hartmann
af0728e530 QmlDesigner: Add early return for invalid row
Also avoiding reflection by locking during the write to the model.

Change-Id: I290ae8fa38aae510454d3fa1af020d579881ff9c
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-12 06:51:23 +00:00
Mahmoud Badri
f5b3b5c88e QmlDesigner: Remove empty model from 3D Editor's create sub-menu
Change-Id: Icd6fc773d3f45459e9169406c376a5c47cf41e06
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-09-09 17:49:45 +00:00
Miikka Heikkinen
ed89cc730d QmlDesigner: Fix material preview env and model aux handling
Converted old auxiliary properties usage in material preview to
the new API. Since most properties need to be both persisted to the
document and used by puppet, those properties had to be duplicated.

Fixes: QTCREATORBUG-28085
Fixes: QDS-7624
Change-Id: Idf51c773a2d49d44413bfaf69d4a683692ea8a0d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-09-09 14:22:57 +00:00
Thomas Hartmann
5f3ef5f991 QmlDesigner: Fix QmlObjectNode::generateTranslatableText
This fixes the case for qsTranslate. A context has to be provided.

Change-Id: I96004f13c84e2269b4226d6c184c7874d74955b0
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Aleksei German <aleksei.german@qt.io>
2022-09-09 14:15:41 +00:00
Thomas Hartmann
d24a09a6be QmlDesigner: Add static helper function for translations
Adds:

  stripedTranslatableTextFunction()
  convertToCorrectTranslatableFunction()

Change-Id: I9f8b50924c4c99cda43d32c03080bab83cfaff44
Reviewed-by: Aleksei German <aleksei.german@qt.io>
2022-09-09 14:15:31 +00:00
Thomas Hartmann
9aa5a4cc6c QmlDesigner: Convert translation functions
This converts the translation functions when dragging in items
from the library.

Task-number: QDS-7598
Change-Id: Iaed0f6683c2083e1d103ddfc07fe7ba2a2e9224c
Reviewed-by: Aleksei German <aleksei.german@qt.io>
2022-09-09 14:15:19 +00:00
Christian Stenger
c1556392eb Squish: Avoid crash
Due to high frequency of re-usage of the processes we may clash
with the destruction of a formerly running process using the same
QtcProcess object. Explicitly closing it before (re)starting
cleanly destructs the former process.

Change-Id: Id26e55ac3aaf5c24178d168c6391ae0c51139684
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-09-09 12:57:23 +00:00
Jarek Kobus
c94382aea5 QtcProcess: Add an assert about restarting from signal handler
Change-Id: I66ede2c8d726929ceb31a456eb8692e051c1b09e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-09-09 11:57:57 +00:00
Jarek Kobus
fa9008c7f8 VcsOutputWindow: Don't append \n when line ends with \r
Amends a2797ec80e

Fixes: QTCREATORBUG-27615
Change-Id: I5b2d2bc442696a1560a2af3dfe14e70a9c42cc88
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-09-09 11:29:49 +00:00
Thomas Hartmann
181f9f276c QmlDesigner: Propose Item as property type
Change-Id: Ib0a0cfd0594993e3050b7af38d6ef549b1780b44
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-09-09 09:23:39 +00:00
Thomas Hartmann
45fb37abe7 QmlDesigner: Use null instead of 0 for Item
Change-Id: Ifd6f06642308a981f7c50604ac1f1db56eabc261
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-09-09 09:23:26 +00:00