Commit Graph

85780 Commits

Author SHA1 Message Date
Jarek Kobus
185454bc9b VcsBase: Use more Core namespace
Drop also some Utils:: specifiers.
Drop superfluous typedef.

Change-Id: I0cb12fb3fe9336ca44849198db291dfbe278df4a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2024-01-17 08:07:49 +00:00
Jarek Kobus
f917905f30 VcsBase: Remove OutputWindowPlainTextEdit::parser()
Change-Id: I064b15708a9bacf92e83122021764df9b276995f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2024-01-17 08:07:42 +00:00
Jarek Kobus
af70c06f86 VcsBase: Merge appendLines() with appendLinesWithStyle()
Remove m_format member.

Change-Id: Ie643985a07e258f8f326e44e106f7a711d6d2967
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2024-01-17 08:07:36 +00:00
The Qt Project
ba2c95ce99 Merge "Merge remote-tracking branch 'origin/12.0'" 2024-01-17 08:06:06 +00:00
Eike Ziller
5395cc9b2c Merge remote-tracking branch 'origin/12.0'
Change-Id: I42e2cd3e14d9570c94ed2f5eb13d688191144767
2024-01-17 09:05:44 +01:00
Marcus Tillmanns
69bbfee3b8 LanguageClient: Fix wrong class name
Change-Id: I8a1d87c3f1140ba2172efd3d1a1cca40186b31dc
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2024-01-17 08:05:04 +00:00
Henning Gruendl
316e48fc50 QmlDesigner: Remove version number from imports
Task-number: QDS-11177
Change-Id: I94a537af1d55d503aa04dd79c6194ef1a0647e83
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2024-01-17 08:01:32 +00:00
Henning Gruendl
3ad3a5f197 QmlDesigner: Remove unnecessary imports
Remove QtQuickDesignerTheme import if not needed.

Task-number: QDS-11177
Change-Id: Ia72001855bb636bfc2ddf11cbb00359fbe123c90
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2024-01-17 08:01:09 +00:00
Henning Gruendl
00319468a6 QmlDesigner: Fix PopupDialog being obscured
Fix the PopupDialog being obscured by detached views.

Task-number: QDS-11657
Change-Id: Ifc0022159a65a110b6e7a25e442a41e3db692c14
Reviewed-by: Ali Kianian <ali.kianian@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2024-01-17 08:00:45 +00:00
Jarek Kobus
24ad9e7056 DiffEditorController: Reuse TaskTreeRunner
Change-Id: Id294ce5f951c3c9f4a651d7fa52a021f507cba02
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-01-16 19:34:53 +00:00
hjk
956d6d1c45 ResourceEditor: Hide plugin class definition in .cpp
Change-Id: I43969235a6003cfa800c621447d6c754bbad4262
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2024-01-16 17:35:35 +00:00
hjk
a7bf47bf49 ResourceEditor: Move ResourceEditorW definition to .cpp
And simplify constructor.

Change-Id: Ib0526f468aed0604a6b71ac180c02e408318f4ce
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2024-01-16 17:28:35 +00:00
hjk
fc36218d39 ResourceEditor: Move editor action setup closer to editor
Not yet business as usual, but moving closer and cutting some
dependencies.

Change-Id: I6331b256cbbde0abcc67251b1d32521f234fca2b
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2024-01-16 17:28:31 +00:00
hjk
a845fad7bd ResourceEditor: Move editor factory close to editor
Change-Id: Ie49a35e7c5de5793b25ed49de5e58b0d4a5c5621
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2024-01-16 16:57:16 +00:00
Christian Kandeler
35adff595a Utils: Move help text from EnvironmentDialog to NameValueItemsWidget
No user-visible changes.

Change-Id: I2868fb96f507dce30ae7643b6639dddcf635011a
Reviewed-by: hjk <hjk@qt.io>
2024-01-16 16:49:20 +00:00
Jarek Kobus
6f1fd5dc67 ClangTool: Reindent properly runRecipe()
Otherwise the parent diff looks giant.

Change-Id: Ia3f8ef86ee81efd24f77f78a95955ffbab85dbd9
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2024-01-16 16:49:03 +00:00
Jarek Kobus
4aec4e7ff7 ClangTool: Use LoopRepeat for running clang
In this way we don't construct a giant recipe
(~7000 tasks for Creator project) but simply repeat
the task execution many times.

Change-Id: I84addeb6b1ac4ad71a654298e290d99df59bbf82
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-01-16 16:48:49 +00:00
Jarek Kobus
fe05314fbf ClangTool: Filter out the units list before constructing the recipe
Change-Id: Ic902b79d29bd9b640edc281adc43fb04fe06773b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-01-16 16:45:05 +00:00
Jarek Kobus
1ed8b56702 ClangTool: Separate unit from AnalyzeInputData
Pass it separately instead. It's going to be replaced by
list of units.

Change-Id: Ie557bc0ae996b816a69b60a6e9792ca157829c78
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2024-01-16 16:44:50 +00:00
hjk
cab71e1005 QtSupport: Move plugin tests closer to tested code
Change-Id: Icad424d6def03b6a233b84144d405a2477738141
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-01-16 16:06:24 +00:00
Jarek Kobus
149f5bb8b5 VcsBase: Rename paramWidget -> editorConfig
VcsBaseEditorConfig isn't widget based.

Change-Id: I49c168f6ab48da54cfa4b0993f777375a19a64df
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2024-01-16 15:28:51 +00:00
Jarek Kobus
2632f66672 VcsBase: Get rid of unused extraOptions arg
Change-Id: Ie434a2cd3b4e84465fe3ae419604bda184bcd34a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2024-01-16 15:28:44 +00:00
Jarek Kobus
e4c47b8d1c Subversion: Get rid of unused extraOptions arg
Change-Id: Ic2e8c7c1a1dcebc09f12c65c75cc937743579a61
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2024-01-16 15:28:36 +00:00
Jarek Kobus
8f35ec13e1 Mercurial: Get rid of unused extraOptions arg
Simplify the implementation of showDiffEditor().

Change-Id: I0b5a2c1783d0e1723322208276c2a71554d55ea8
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2024-01-16 15:28:28 +00:00
Shrief Gabr
e6c0c82ce8 QmlDesigner: Remove trailing zeroes from numbers
Task-number: QDS-11578
Change-Id: Ifbbe5ef764ad383863db07dc2cfaf444af7c8805
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2024-01-16 15:11:05 +00:00
Sami Shalayel
a38e8cdaaa qmldocumentparser: adapt to changes in Dom
Make qmldocumentparser compile again.

Change-Id: If32264d138f599015698612efa40d9e052fbdbfe
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2024-01-16 14:20:24 +00:00
Shrief Gabr
f5cb1530a4 QmlDesigner: Add context menu to the cell
Task-number: QDS-11253
Change-Id: I4b93feb867d0d78d9e9b473c9dd6a645c031ccaf
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2024-01-16 14:09:12 +00:00
hjk
2f987932c1 QmlProjectManager: Hide plugin class in .cpp
Change-Id: If9ed1c00c53f127ba328f5011772431b5e5b25f9
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2024-01-16 13:44:46 +00:00
Ali Kianian
63f98ec9e4 QmlDesigner: Keep the order of columns in CollectionEditor
Fixes: QDS-11508
Change-Id: Ic75f86207149469ed4b08605db9feb10c4e1141d
Reviewed-by: Shrief Gabr <shrief.gabr@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2024-01-16 13:43:34 +00:00
Ali Kianian
cb868a4c9e QmlDesigner: Set texRole when assigning a collection to a node
Task-number: QDS-11461
Change-Id: Ia03c8267cc6f6b93860aa853afb048650f1acb3f
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2024-01-16 13:43:20 +00:00
Marcus Tillmanns
0d14a4e010 Core: Fill SaveAs path
This allows a document to only specify a fallbackSaveAsPath
and still have the FileDialogs filename pre-filled.

Also allows to only set the path and not the File name if only a
fallbackSaveAsPath is specified.

Task-number: QTCREATORBUG-30200
Change-Id: I0703bbf868c6f014a6679cef096a82c76af09da0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-01-16 12:51:29 +00:00
hjk
320a0da060 QmlJsEditor: Work around moc-produced 'using namepace'
... for QmlJsEditor::QmlJsEditor causing ambiguities.

Change-Id: If15a0cb0410093857848b871d7f99c84b1b35826
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2024-01-16 11:48:53 +00:00
hjk
b63e2d39e8 QmlProjectManager: Cleanup qmlprojectplugin.cpp
... in preparation of moving the plugin class.

Change-Id: I449439f8db0a1c74dde51bf33a6f0e01fbc2a727
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2024-01-16 11:46:07 +00:00
hjk
9c8e5d4cdb Python: Simplify PyLSConfigureAssistant setup
Change-Id: Icdd8d0017a8fe71f579af6f19fa2b870f0677efc
Reviewed-by: David Schulz <david.schulz@qt.io>
2024-01-16 10:43:28 +00:00
hjk
5de41fb40d Python: Use new plugin items setup pattern for PythonEditor
Change-Id: Ie8516960a106ddeff415b6412d9af66f7d2f0f36
Reviewed-by: David Schulz <david.schulz@qt.io>
2024-01-16 10:43:06 +00:00
hjk
1992efddfc Python: Move plugin class definition to .cpp
The plugin classes partially changed there purpose, they are no more
meant to provide internal utility functionality.

Change-Id: I9b9200995eaa95dcd924c94dcedb28e6d5db0be9
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2024-01-16 10:42:45 +00:00
Christian Kandeler
590a54828c QmlJSTools: Fix qbs build
Change-Id: I3875afb3034cc8eb4dfe79f73a0b84edeb714c70
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-01-16 10:29:49 +00:00
Jarek Kobus
46b2d58310 AutoTest: Reindent properly runTestsHelper() [part 2]
Otherwise the grandparent diff looks giant.

Change-Id: I05a862e01a712dbbec49b4b21b77a157bd483268
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-01-16 10:04:38 +00:00
Jarek Kobus
05434b71e2 AutoTest: Reindent properly runTestsHelper() [part 1]
Otherwise the parent diff looks giant.

Change-Id: I998f08d271bf231ad33154aeab5b349b1c1e83ad
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-01-16 10:04:28 +00:00
hjk
c6dce7e039 QmlJSTools: Hide plugin class in .cpp
Change-Id: Idfd3741141c076e2269fee99c89ef15f6e6f3b7c
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2024-01-16 09:53:51 +00:00
hjk
2a02866787 QmakeProjectManager: Hide plugin class definition in .cpp
Change-Id: If813b4eef86084a126c1d4a45e53b056d55f7caf
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2024-01-16 09:53:43 +00:00
Marcus Tillmanns
b1ec196c14 CompilerExplorer: Add fallback document path
Fixes: QTCREATORBUG-30200
Change-Id: Iecbecf9f065a938881e2afa33ff6736bc3f2ee4a
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2024-01-16 09:50:54 +00:00
hjk
53ebc15918 QmlJsEditor: Hide plugin class definition in .cpp
Change-Id: I7d6325059aedd92b34072de1fbb05bc72fc95efd
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2024-01-16 09:50:00 +00:00
hjk
d9108d1ae2 LanguageClient: Hide plugin class definition in cpp
As part of that, move test object creation closer to tested code.

Change-Id: I60f1e431fbdd4ebc2a01ab6ed0c779c288c81b06
Reviewed-by: David Schulz <david.schulz@qt.io>
2024-01-16 09:43:52 +00:00
Jarek Kobus
f44112ed22 AutoTest: Use LoopRepeat for test runner
Change-Id: I2b7eb32732aa1f12b23a719d0c4cce14dd0d7114
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-01-16 09:36:47 +00:00
Jarek Kobus
54e0433975 VcsBase: De-virtualize diff()
Change-Id: Ib8bd115abd4818ef9b5a298348fce36dd91cffc0
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2024-01-16 09:34:55 +00:00
Jarek Kobus
b855b1f907 Mercurial: Get rid of a fake overload
The only callers are coming from the Mercurial plugin.
The overload doesn't call the base implementation.
So, there is no relation to the base impl.

Change-Id: I718e3ab196e9df77f6682b3230a8739db58c0238
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2024-01-16 09:34:48 +00:00
Jarek Kobus
d5d08c2e53 Subversion: Get rid of a fake overload
The only callers are coming from the Subversion plugin.
The overload doesn't call the base implementation.
So, there is no relation to the base impl.

Change-Id: I71c9587f1eb2493a9a58df7d814c4cadfc23adf0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2024-01-16 09:34:41 +00:00
Ali Kianian
daf23602fe QmlDesigner: Use ColorEditor as view delegate in CollectionEditor
Use StudioControls.ColorEditor as a view delegate for the
CollectionDetailsView

Task-number: QDS-11114
Change-Id: Ic91d734c4fc62ddb51c4db7029714d409d51b732
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2024-01-16 09:23:39 +00:00
Christian Stenger
5a86b883fa QmlPreview: Avoid processing all editors
Only act if there is a preview running. Explicitly connect and
disconnect to the editor manager if the preview gets triggered.
Fixes displaying message boxes when changing qml documents
without a running preview.
Reverts 66d94a82a32cdfdb344d55ef2c610ee9b3f03f7fi which had been
a hotfix and provides a more intrusive solution to the misbehavior
revealed by 5336fd83a0.

Change-Id: I88be4eca077ac1d56d8e4790a70220e7d3efa960
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-01-16 09:10:02 +00:00