Commit Graph

62421 Commits

Author SHA1 Message Date
Christian Kandeler
9dcf2bd2c4 LSP: Do not stringify UnknownErrorCode
It looked very ugly in user-facing messages.

Change-Id: I7dfb91435e272b39b64d928dfeba628afba8f3b7
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-09-22 10:19:01 +00:00
David Schulz
e7237a9675 LanguageClient: ensure that deleted clients are untracked in manager
Change-Id: I0624ce9e6f8788af7193ebdf87b72497bab0ba39
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-09-22 10:07:59 +00:00
David Schulz
1c05237820 LanguageClient: prevent accessing freed data on shutdown
Change-Id: I0d6e7abd653acb2ab7409a9cd5e58a2df3b1f259
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-09-22 10:07:53 +00:00
David Schulz
d86a67e0bc Core: add commands for settings pages
Makes it possible to assign shortcuts to individual settingspages as
well as opening them from the locator actions filter.

Change-Id: Ief3f0e9144d1338f5ab107203f8fb64bb0c6471a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-09-22 10:05:45 +00:00
Alessandro Portale
01d27eec6b Utils: Restore original look for non-flat project mode on non-macOS
Amends: 74f5ad6583

Change-Id: Ia38e1d82e59d633506703427ee8352e57cc606dc
Reviewed-by: hjk <hjk@qt.io>
2022-09-22 09:39:04 +00:00
hjk
a35a19d165 Utils: Introduce FilePath::{root,schemeAndHost}Length(QStringView)
Intended as helpers for parentDir() to stop when cutting components.

Change-Id: I7615803743351a733d6f3cc9813e9de85973dc61
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2022-09-22 09:19:42 +00:00
hjk
dbbfb59ad9 Qnx: Use a bit of LayoutBuilder in QnxDeployLibrariesDialog
Less user code.

Change-Id: Ief2ad4c57a082752551db7db7d0020dd1775c7a1
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-09-22 09:19:11 +00:00
hjk
9ac27ad8aa QmlDesigner: Compile fix after source-incompatible changes in Qt
The use of 'auto' here is the simplest way out and should not be
taked a precedence for other code.

Change-Id: I4435e7211139bccfca4b10ed2407ba39afe0b400
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
(cherry picked from commit b852886763)
Reviewed-by: hjk <hjk@qt.io>
2022-09-22 09:18:56 +00:00
The Qt Project
113a011691 Merge "Merge remote-tracking branch 'origin/8.0'" 2022-09-22 09:13:54 +00:00
Christian Stenger
18a464446a Squish: Omit some files when handling shared files
Special files like automated backups of other editors or
files generated by running the tests should not be listed
as shared files.

Change-Id: Ia62ec9e14c6ffd1422705defb680f3232627848b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-09-22 08:39:24 +00:00
Tim Jenssen
80e2eddd95 Merge remote-tracking branch 'origin/8.0'
resolved conflicts:
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp
	src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
	src/plugins/qmldesigner/designercore/exceptions/exception.cpp

Change-Id: I13a5248415fa1ae03e1c6d0972d9b3bb8c80a3b0
2022-09-22 10:32:40 +02:00
Christian Stenger
f8139643aa Fix qbs build
Change-Id: I27d414123231917e3f04d2d40f3fe6ff9eb5c535
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-09-22 08:11:08 +00:00
Alessandro Portale
645fce14e0 Designer: Convert to using Tr::tr
Change-Id: I1008a1a398809eee38fd006aac997c59b787dfbd
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2022-09-22 07:34:30 +00:00
Alessandro Portale
8fab6a7259 Designer: inline newclasswidget.ui
Change-Id: I85b9633dca0a8424b9a026a50f436aed2b13c5e7
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2022-09-22 07:34:23 +00:00
Alessandro Portale
59ae002e92 QmlProfiler: Convert to using Tr::tr
Change-Id: I9f4f8c0e499eeb1e686d1094f3442c415b845c21
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2022-09-22 07:33:51 +00:00
Alessandro Portale
88489fa956 PerfProfiler: Convert to using Tr::tr
Change-Id: Ied3f0a499a1b5c6da752667a44525ecce66febac
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-09-22 07:33:20 +00:00
Christian Kandeler
a522215840 CppEditor: Move renameFilesForSymbol() to ProjectExplorer
We'd like to use it outside of CppEditor in the future.

Change-Id: Ie7553a17aa1d86fb898eaa315a1613ac0ff6b452
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-09-22 07:09:38 +00:00
Alessandro Portale
62a7ae5e30 PerfProfiler: inline perftracepointdialog.ui
Change-Id: I138d3a4aeae2eef0e2127e8770961109d252ec98
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-22 06:52:49 +00:00
Alessandro Portale
58b0f2d8f9 CtfVisualizer: Convert to using Tr::tr
Change-Id: Ide0c6556642c20a200fd72ec8e9596950af823b4
Reviewed-by: hjk <hjk@qt.io>
2022-09-22 06:52:42 +00:00
David Schulz
55b17f8908 UpdateInfo: add action to start maintenance tool
Change-Id: Icb37dc0f5634ccd11aa34aa8dc256bf796301b2f
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-09-22 06:50:49 +00:00
Thomas Hartmann
fec59c21df QmlDesigner: unlock model when resetting in rewriter
We have to unlock the model to revert the model to
the last correct state.
The unlock method is not supposed to be used elsewhere
and hidden in a private header.
Fixing miss leading warning in destructor.

Change-Id: Ia14aab2a8ffdc1cb9fa9b2968cdef38bfc84e5d5
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-09-22 06:44:35 +00:00
Christian Stenger
24cd57ea45 Squish: Limit breakpoints to script language in use
Change-Id: I908fd61f0778f8a70a8d4494d7963ea57abd022a
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-09-22 06:13:39 +00:00
Christian Stenger
1fd916f1f4 Squish: Use a fixed color for the progress bar text
We define the background color in use and should not rely on
the palette of the theme to have a text color that is readable
on the background. Avoids having unreadable text.

Change-Id: I9c032639dc142ea4a9b00f272d06a279678e8045
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-09-22 06:13:29 +00:00
Christian Stenger
027c539609 Squish: Only try to run test cases
Change-Id: I4ee39b58f313ec8c9e475a6af23f0efd8c55bfef
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-09-22 06:13:23 +00:00
Christian Stenger
c4ff50cc88 Squish: Prevent potential crash
Change-Id: Iffd5590dd4a06fc4cdb64431cbcb6473f4b9aaad
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-09-22 06:13:14 +00:00
Christian Stenger
93c503fa30 Squish: Remove unused code
Change-Id: I245a37cbf5671a31ea9e627221c3f4cf8a94d59d
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-09-22 06:13:08 +00:00
Christian Stenger
296a36ff16 Squish: Add basic support for recording test cases
Change-Id: I104151b36c5cdeaa3a70dfc66dd26784195f37ed
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-09-22 06:13:00 +00:00
Tim Jenssen
d90456d469 qmldesigner: remove old splashscreen ui code
It has visible: false so it is not in use,
but it produced some warnings.

Change-Id: I2fc9c5d1c06b14d0e9104f9e1507baeabdc5f4bc
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-09-21 16:44:39 +00:00
Jarek Kobus
5eae4d5279 VcsBaseClient: Fix going to default line number
Since we are being connected to the same done() signal twice,
the order of slot invocations started to play a role.
We were connecting done() signal to
VcsBaseEditorWidget::reportCommandFinished() first
and to VcsBaseEditorWidget::setPlainText() afterwards,
so they were executed exactly in this order. However, this
order isn't desired, as we need to set text first and
jump to line afterwards.

In order to fix it so that we don't rely on connection
order we handle setting the content and jumping into
the default line in one common handler.

Amends c767f193ce

Change-Id: Iea17476cc25b54759457710ecb6b6de2f0f5caf7
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-09-21 16:31:44 +00:00
Tim Jenssen
39e3ae0338 qds: add feature to Key_Escape the splashscreen
Change-Id: I815b15a9234e693518feb1ff6b218dc607bd3578
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-09-21 14:05:07 +00:00
Tim Jenssen
a527ceff60 qmldesigner: make DesignerSettings thread save
Change-Id: I07074b35456533e9729644ef3647803d477bd6f1
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2022-09-21 14:01:23 +00:00
Jarek Kobus
1dbdc46ea1 ClearCasePlugin: Reuse CommandResult
Get rid of ClearCaseResponse struct.
Replace foreach with range-based for loops.

Change-Id: Id78e2ca3598c16ad16ebaeddae73a140e3473936
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-09-21 13:56:09 +00:00
Marco Bubke
4516f3dac3 QmlDesigner: Move exception warning out
Breaking dependencies for the model.

Change-Id: I231435b5d79fe201c589e75b2835dccea7e87937
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-09-21 13:53:35 +00:00
Brook Cronin
a6a7ca3688 QmlDesigner: Add new icon font for design viewer
Add icons for Design Viewer UI to font, constants and theme.h

Change-Id: Ib0645791a77ff2857be78758dfa0d0e880810042
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2022-09-21 13:46:24 +00:00
hjk
978a182ca3 Utils: Only construct FSEngineImpl::m_tempStorage when needed
The QTemporaryFile default c'tor is quite heavy.

Change-Id: Ia468c29a154e21d06a25d035dc591ea3ed70ca14
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2022-09-21 13:19:25 +00:00
hjk
b852886763 QmlDesigner: Compile fix after source-incompatible changes in Qt
The use of 'auto' here is the simplest way out and should not be
taked a precedence for other code.

Change-Id: I4435e7211139bccfca4b10ed2407ba39afe0b400
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-09-21 13:17:26 +00:00
David Schulz
c849a1b1e9 LanguageClient: log progress duration
Change-Id: I443f6c909b5ba15babf4741937b99d57c5825169
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-09-21 13:11:19 +00:00
Christian Kandeler
58fbc2e8b8 QmlDesigner: Fix qbs build
Change-Id: Ifb7f0967d8811ea919bc9797944c4e120d4df756
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-09-21 13:11:01 +00:00
Thomas Hartmann
e84db05786 QmlDesigner: Fix merge conflicts
Task-number: QDS-7723
Change-Id: Id788bb89dc9734c77e01302d9ce50fcb712c67bb
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-09-21 13:07:14 +00:00
Eike Ziller
656731d549 VcsManager: Fix crash when input directory is /
If the input directory in VcsManager::findVersionControlForDirectory is
just "/", that slash gets chopped off by absoluteWithNoTrailingSlash,
and the resulting string is empty. So we need to handle that case.

Change-Id: I7970043a16e587c803e94c16b71bea481ea21c09
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-09-21 12:53:54 +00:00
Marco Bubke
ce97e5ccca QmlDesigner: Remove mcu dependency from model
The function is only called in the formeditor. So moving it to the
formeditor removes the dependency to the mcu manager.

Change-Id: I1a1d6f65b97340206ea0d485b24046c3661daf92
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Aleksei German <aleksei.german@qt.io>
2022-09-21 12:51:55 +00:00
Thomas Hartmann
52efe45354 QmlDesigner: Allow functions of animations
For some reason we get nullValue for the functions
of animations like 'update', 'start', 'restart', 'stop', 'pause'.

Change-Id: I2301083d6d61e2f8f59e5878023cac0fcf711e61
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2022-09-21 10:55:54 +00:00
Eike Ziller
3011548066 Merge remote-tracking branch 'origin/8.0'
Conflicts:
	src/libs/utils/deviceshell.cpp
	src/plugins/clangcodemodel/clangdclient.cpp
	src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp
	src/plugins/remotelinux/linuxdevice.cpp

Change-Id: Idc2edf428c98e9cbc891f1833b271ce2def9a835
2022-09-21 11:16:29 +02:00
Marcus Tillmanns
5ebb467cc6 Deviceshell: Cleanup shellProcess destruction
Change-Id: I71507d9e74979fca461784575257e7bafd1b4838
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-09-21 08:51:47 +00:00
Christian Kandeler
d696f3380c ClangCodeModel: Add missing check in ClangdFindLocalReferences
When trying to find out whether a symbol refers to a local variable, we
first look up its definition. Afterwards, we need to check whether that
definition is located in the same file. This was forgotten, which lead to
seemingly random weirdness when trying to rename non-local symbols.

Change-Id: I505675a784fc69dc4f01105033608116fc7720c2
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-09-21 07:44:32 +00:00
Christian Kandeler
720d07928b ClangCodeModel: Add missing check in findLocalUsages()
When trying to find out whether a symbol refers to a local variable, we
first look up its definition. Afterwards, we need to check whether that
definition is located in the same file. This was forgotten, which lead to
seemingly random weirdness when trying to rename non-local symbols.

Change-Id: Icdcfd5583bf33346d8f0e3caf2751fd16f7d9602
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-09-21 07:21:15 +00:00
Christian Kandeler
c2937f609e LanguageClient: Do not cancel search on empty result list
... for a rename request.
Instead, simply finish the search normally, leading to a "no matches
found" message rather than the misleading "search canceled".
But do cancel the search on an actual error.

Change-Id: I10401466bb4d81d53d26b8dc08bfed91db86cd5a
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-09-21 07:19:04 +00:00
Eike Ziller
ccfd472a8c Generic highlighter: Try mime type aliases when looking for definitions
For example the yaml highlighting file declares text/yaml as the
supported mime type, but that is not the canonical name, which is
application/x-yaml.

Change-Id: If9e3f5e31bc5593a82cbbdac916ef41b0d23de7c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-09-21 07:03:01 +00:00
The Qt Project
49190e989e Merge "Merge remote-tracking branch 'origin/8.0'" 2022-09-21 06:02:18 +00:00
Jarek Kobus
29ecc7b5dd VcsCommand: Rename execute() to start()
In order to conform to QtcProcess API.

Change-Id: I71fcc03846f32cd3c2df39824ce3f6730c20ebbb
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-09-21 05:33:46 +00:00