Commit Graph

68765 Commits

Author SHA1 Message Date
Eike Ziller
d172e59d6e External tools: Fall back to active project's Qt
for the Qt related external tools, if there is no open document with a
project.

Change-Id: I1d059d70e5163921a8d98b6a93224aef1fbf1743
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-04-28 06:55:01 +00:00
hjk
b3df7c3cdb CppEditor: Use IOptionPage::setWidgetCreator() for settings
Change-Id: I0d2f8ffae7ca4e7360de0f69566ab03036c10c53
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-04-28 06:45:32 +00:00
Tim Jenßen
9c2a73b1c8 Merge remote-tracking branch 'origin/10.0' into qds/dev
Change-Id: I51801c3bec7e29f7c7384d86d79b4fcabb4f99c1
2023-04-27 20:30:00 +02:00
Henning Gruendl
3b8c38c7f0 QmlDesigner: Add support for valueRole in ComboBox
- Add support for valueRole in HelperWidget.ComboBox in order to allow
  for custom JS arrays that define value and text role
- Replace specialized invokables in item filter model which are only
  available in that particular model with general purpose functionality
  provided by QML ComboBox
- Remove unnecessary functions from item filter model

Task-number: QDS-8737
Change-Id: I58bd3fed395961ac4495a0c6e9ff47c9b87e0de2
Reviewed-by: Ali Kianian <ali.kianian@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-04-27 17:44:01 +00:00
Thomas Hartmann
351e11a73d QmlProject: Fix mainUiFilePath()
The method mainUiFilePath() is supposed to return the actual file path
that is relative to the project file.
Removing mainUiFilePath() from QmlProjectItem, since QmlProjectItem
is supposed to contain only the pure data.

Task-number: QDS-9650
Change-Id: Iad474586cad8f8cef745aadb63d421573d7d9c83
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-04-27 14:11:46 +00:00
Thomas Hartmann
3be61f0be9 QmlDesigner: Activate kit after adding
We do not remove other targets anymore and instead activate
the added one.

Task-number: QDS-9652
Change-Id: I29d5b9e878b928611a1e854fd212682153b89d63
Reviewed-by: Burak Hancerli <burak.hancerli@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-04-27 14:09:08 +00:00
Thomas Hartmann
932ae0411c QmlDesigner: Block more imports
Block QtQuick3D.MaterialEditor, QtDataVisualization and QtQuick3D.ParticleEffects

Task-number: QDS-9799
Change-Id: I68e2f7a467f4e6c7e6ba1ebfedf7880425b2fdda
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-04-27 14:00:49 +00:00
Knud Dollereder
3f32409748 QmlDesigner: Cleanup mcu deploy step
Change-Id: I4f4fa4f9067613cb31c7408a89a25cf27f2093e3
Reviewed-by: Aleksei German <aleksei.german@qt.io>
2023-04-27 13:51:26 +00:00
hjk
198d07e256 ProjectExplorer: Use IOptionPage::setWidgetCreator() for main kits page
Change-Id: I25545bfb00af3715adae35ba70e52e963dcdfc76
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-04-27 13:47:02 +00:00
Christian Stenger
927c34df2f Core: Fix item flag on locator settingspage
Do not make the 'included by default' column editable as this would make
the column act strange on double clicks.
Instead of providing a non-functional change opportunity for the
checkstate's value this is now handled similar to the double click on
other columns.

Change-Id: Id2851b2bfe2b7cda8c3231f58bf436196a533171
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-04-27 13:26:49 +00:00
hjk
1a1b040642 ProjectExplorer: Use IOptionPage::setWidgetCreator() for settings
Change-Id: I4267e577ce91d97e633e8cdf513bde496d3f7c09
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-04-27 12:53:50 +00:00
Marco Bubke
2c55b246c9 QmlDesigner: Increase Qt version condition
We need Qt >= 6.4.3 for the module scanner.

Change-Id: I496051e1ce6cbcb8100ede2e5026414799cc50ba
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-04-27 12:26:02 +00:00
hjk
b23dbc310c Qnx: Do not re-validate information on each Qt version manager chance
That's rarely resulting in an actual change, but fairly expensive
and triggered often, even when not actively using Qnx.

Change-Id: I784bc7fa4919bf48711036d655e8246805aa578b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-04-27 11:45:46 +00:00
hjk
1eb765ecbb Qnx: Use more declarative syntax for settings page items
Change-Id: Iced5efa88b059a55d7d0b3e33a24bbf3b9423fbc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-04-27 11:24:12 +00:00
hjk
e0aaa3960f Qnx: Ensure up-to-date contents of combobox in settingspage
Change-Id: I2b157ac60d6ce79238c22fcdcb042798940ba647
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-04-27 11:17:19 +00:00
Cristian Adam
3aec6b776c CMakePM: Fix presets condition with a const value
Fixes: QTCREATORBUG-29077
Change-Id: If1ebaa22c07eaa39fb8d4f24c33f26249f17d793
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-04-27 09:50:24 +00:00
Marcus Tillmanns
1339a4a998 TextEditor: Add valid checks for text lines
QTextLayout::lineForTextPosition can return invalid lines,
which when accessed may crash. To workaround we add
QTC_ASSERT to guard against this (see linked issue crash report)

Fixes: QTCREATORBUG-28837
Change-Id: I66d8d8a46e766caa492ec2178b1fa88e35211333
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-04-27 09:24:43 +00:00
Eike Ziller
2b640f3dc3 Support creating directories from file system locator
It was already possible to create files, so add the option to create
directories instead.

Change-Id: I2e70dba0015ab30b1757f09c74eb2c2dd0db296b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-04-27 08:59:26 +00:00
Artem Sokolovskii
7c1f2ea16d ClangFormat: Fix autoindentation for QML_ and Q_ macros
Fixes: QTCREATORBUG-29086
Change-Id: Ie23e46baf2c802799818cb724aacd71776480b06
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-04-27 08:43:41 +00:00
Jarek Kobus
fad8ed8e28 ILocatorFilter: Simplify Sync's onSetup in matchers
Remove no longer necessary bool return value from onSetup
functions and from refresh recipe functions,
see df5e3c587a.

By default, when no return bool is specified inside a function
passed to Sync element, it's assumed that the return value is true.

Eliminate passing "=" captures in 2 lambdas.

Change-Id: I5005821444a386f70c0f05322812f98d3fd49926
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-04-27 08:42:34 +00:00
Jarek Kobus
df5e3c587a TaskTree: Enhance Sync's function
Make it possible to pass a void returning function to the
Sync constructor. In this case it's assumed that function
returns true by default and finishes successfully.

Add some helpful error messages when requirements for the
passed function are not met.

Change-Id: I8be75acd277d06e87db3c87a6eb96173aa9cd890
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-04-27 08:11:24 +00:00
Cristian Adam
65a1637d61 CMakePM: Fix presets transitive inheritance
Fixes: QTCREATORBUG-29076
Change-Id: Ibe4c3eebb3fcebeabafc485949a19e696ecad2de
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-04-27 08:00:53 +00:00
Marcus Tillmanns
1a658eff26 FakeVim: Clear suggestions on mode change
Change-Id: I5d3a37ab61f83a70e055063de397654f5621401d
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2023-04-27 06:56:47 +00:00
Jarek Kobus
86cdc6667d RunConfigurationLocatorFilter: Reimplement matchers()
Change-Id: I36a0aca3eac0ecb7988e1c68056601054837b4ad
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-04-27 06:18:56 +00:00
Jarek Kobus
76ba3ea6a5 ActionsFilter: Reimplement matchers()
Change-Id: I54421904ce17118984e5dd6f02e2adee75849dde
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-04-27 06:17:37 +00:00
Jarek Kobus
82e57b4e9f QmlJSToolsPlugin: Reimplement matchers()
Change-Id: If6767b4dc62eddddce0285b7b766f44241f3367e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-04-27 06:17:21 +00:00
Jarek Kobus
7db28e788f CMakeTargetLocatorFilter: Reimplement matchers()
Change-Id: I1d515da13ca2b9c84b4b21565926d6df8ca8db99
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-04-27 06:16:03 +00:00
Christian Stenger
a5e5058c41 FakeVim: Avoid using invalid regular expressions
Print a warning in case of an invalid regular expression
and do not apply it to the settings.
This silently drops invalid regular expressions entered
and restored from settings.

Change-Id: I2f7686066541cf2307cf7cf96b3c6f89f6a677d8
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-04-27 05:15:02 +00:00
Ulf Hermann
8482e2405e FileInProjectFinder: Fix path analysis
The previous code let to all possible paths to be accepted with maximum
confidence.

Fixes: QTCREATORBUG-29090
Change-Id: I3e0876d2fd1a5636dbe45cf152c8a251316185ff
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-04-26 20:26:02 +00:00
Jarek Kobus
ec0462748b CommandLocator: Reimplement matchers()
Change-Id: I57fd82dda9b74eff470c1708e12df1361294c575
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-04-26 19:13:52 +00:00
Ulf Hermann
f9619ef381 QmlDesigner: Place qmlpuppet configuration in system import path
The system import path is called "/qt-project.org/imports". The fact
that the qml tool gets this wrong doesn't mean that qmlpuppet has to get
it wrong, too.

Task-number: QDS-9342
Change-Id: If6e2c636b840d112e566ee4b67e916f97a8d52e5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-04-26 17:44:46 +00:00
Marco Bubke
128ac85f79 QmlDesigner: Fix unused warnings
Change-Id: I7791f6c6c9553a5a746b62b37e8846c5f479987d
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2023-04-26 15:28:24 +00:00
Thomas Hartmann
55687264fc QmlDesigner: Block more imports
Change-Id: Ie6892d32594cc4f742ff48bebd82584e1ae2f82c
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2023-04-26 14:44:27 +00:00
hjk
3d354290be Terminal: Use IOptionPage::setWidgetCreator() for settings
Less boilerplate for the implementation add user code access to
IOptionPage::{apply,finish} is planned to be removed.

Change-Id: Id8ec4006d1060be2032caf8eda6bf80760f6db22
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-04-26 13:52:09 +00:00
hjk
7612ef1d0f QNX: Mark toolchains detected by manual operation as "manual"
Change-Id: I9683c4e7f471b9c6485f48ad14fce029522722b3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-04-26 13:25:52 +00:00
Marco Bubke
de2154f1c9 QmlDesigner: Add versioning for core modules
Task-number: QDS-9786
Change-Id: I56c6e9ca06ffcfcaf35cbbee061cb99e7297fca5
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Burak Hancerli <burak.hancerli@qt.io>
2023-04-26 13:16:40 +00:00
hjk
e18c1dceb2 Layouting: Add QTextEdit
Change-Id: I3a74dce8ee7874b73cb11acab52092c4053722b8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-04-26 13:05:48 +00:00
Burak Hancerli
ccf17b02c8 QmlDesigner: Fix project file getter/setter issues
Task-number: QDS-9781
Change-Id: I2df8cca1c4e5cd10563621b849fb54b29c0d155d
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-04-26 12:55:59 +00:00
Jarek Kobus
836cffc161 ExternalToolsFilter: Reimplement matchers()
Change-Id: I158558688f3013329a8970e29744527003070f7e
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-04-26 12:49:55 +00:00
Marco Bubke
463d0e03ae QmlDesigner: Update possible modules for import changes
Maybe we should rename possibleImports in the module to modules() to
make it clear.

Task-number: QDS-9749
Change-Id: I46675d7eaca1f86ea4fe6e5841273e78a8ea2508
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-04-26 12:37:15 +00:00
Jarek Kobus
9d9f1f9c23 MacroLocatorFilter: Reimplement matchers()
Change-Id: I90e638e68414e8b6fc38cc98d85720d05a78df50
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-04-26 12:36:57 +00:00
Christian Kandeler
b024ebda0e ProjectExplorer: Support moving to different dir when renaming
... files in the project tree.

Fixes: QTCREATORBUG-15981
Change-Id: Id704ec0638046e2191638b59e0a597b984d4822a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-04-26 12:32:34 +00:00
Leena Miettinen
e7b5e64a70 Doc: Remove detailed info about wizard templates
Improve descriptions of some wizard templates.

Task-number: QTCREATORBUG-28996
Change-Id: Ib53fa38918120af60a03f3850fed7db1e6f0c391
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-04-26 12:18:57 +00:00
Jarek Kobus
eb41e98b00 ClangCodeModel: Reimplement matchers()
Change-Id: I2d541e24347aa47ec41f88cd7d18004dee7197cf
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-04-26 12:05:23 +00:00
Thomas Hartmann
f640e83a04 QmlDesigner: Use RESOURCE_PREFIX for QmlRuntime.QmlConfiguration
See: QTBUG-104554

Task-number: QDS-9342
Change-Id: I3e097a2c4dd27673ec2a9a7d3e3e9b1e82a722ff
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-04-26 10:48:44 +00:00
Marco Bubke
b929cbfd64 QmlDesigner: Fix QmlTypesParser
Change-Id: I826e1a37747a51602f3f7a8ea675320787080272
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-04-26 09:55:47 +00:00
Jarek Kobus
5a341e087f LocatorFiltersFilter: Reimplement matchers()
Change-Id: I59d7f005e9e044b0375cb94254392f23a330f3f0
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-04-26 09:30:26 +00:00
hjk
0ec89bc10f Qnx: Allow kit creator creation per target architecture
So far there were always kits for "all" (usually three?) archs
created, leaving n-1 of them in an typically unused but expensive
to validate state.

Change-Id: I78c7ed3faea0829104dc62bf358e9e1c62082b01
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-04-26 09:25:12 +00:00
Christian Kandeler
5e73bacb0e CppEditor: Merge two factories
They are closely related, and we might want to add more variants of this
functionality.

Change-Id: Ida83cce018fad5a84d5f6d24a0fa4ff2bca5a67b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-04-26 09:23:32 +00:00
Alessandro Portale
3821683647 StyleHelper: Add setter for "panelwidget[_singlerow]"
20 string duplications warrant a centralized setter. A couple more of
them will come with the upcoming toolbar changes.

Change-Id: Ide8c680da21d5be09f968bcc0a774e062c6f0260
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-04-26 09:23:29 +00:00