Commit Graph

62421 Commits

Author SHA1 Message Date
hjk
3efa0f3961 Combine more of local and remote paths in SimpleTarget runner
Change-Id: Ic50d96b582b355807234618884ec45da09e398d4
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-06-16 10:26:51 +00:00
Samuel Ghinet
50aadacb6e QDS Editor 3D: Allow the user to select (and reset) the color of grid lines
Task-number: QDS-7122
Change-Id: I686269e61b53bd5e3d5d1225376930612d869072
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-06-16 10:17:01 +00:00
Jarek Kobus
af8f6dc039 LinuxDeviceTester: Test if required commands are available
Change-Id: Iaad3ec8667c4134ead86ca9e3239e810554b8f43
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2022-06-16 09:28:49 +00:00
hjk
53896ed295 Utils: Dissolve QtcProcess::stopProcess
Change-Id: Ife07f34ffc69cd30984276464bd89738c2a71311
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-06-16 09:17:23 +00:00
Jarek Kobus
b7a71af4c1 Replace QtcProcess::stopProcess() by stop()
Amends 219339987aaf67fe97c5ffa418879b747545b137

Change-Id: I31709910a5f0a4f4ec5bcbafa422f693b3c2049e
Reviewed-by: hjk <hjk@qt.io>
2022-06-16 09:08:57 +00:00
hjk
152b14207c Replace QtcProcess::stopProcess() by stop() plus waitForFinished
... or nothing, if the process object is destroyed immediately.

Change-Id: I6a1e1928bc49fc20a1c0e0ee9b8f4f723276bbca
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-06-16 08:26:10 +00:00
hjk
bfad59ade0 Debugger: Use QtcProcess::stop instead of stopProcess
Less synchronous in cases where it is not needed.

Change-Id: Ia07e6d293c7f5e6dfb81b06c0ffb6d5d651b88b3
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-06-16 08:26:01 +00:00
Christian Kandeler
07dfd7c0b3 Wizards: Bump QtQuick import version in file wizards
Use 2.15 as default, plus a little heuristic to use the same version as
other files in the project.

Fixes: QTCREATORBUG-27614
Change-Id: Ic84db5da97a9f35a2ad0e57fd47b75fb32a0b7f8
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-06-16 08:23:14 +00:00
Christian Kandeler
ebfbc55166 RemoteLinux: Remove CheckForFreeDiskSpaceStep
This step was of very little use out of the box, as it required the user
to pass sensible values for e.g. the required disk space. Making it
smart enough would require non-trivial effort for very little gain, in
particular as the concept hardly makes any sense at all in conjunction
with deployment via rsync.

Fixes: QTCREATORBUG-27081
Change-Id: I586fceb59947334eba19b10fcc94ecedc661908f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-06-16 08:21:49 +00:00
Thomas Hartmann
53cd1f1ea2 Move the options to the edit menu
This is more consistent with many other tools.
Visual Studio is one of the few tools that
have the options under tools.
and allows to hide tools in the context of Qt Design Studio.

Renaming options to preferences.

Change-Id: I4bb554f00005eb415a203faa8bf7340d047b5a84
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-06-16 07:52:19 +00:00
David Schulz
48a43511c7 ProjectExplorer: fix environment is valid check
Amends d76458a8b6

Change-Id: I0a9d4d6c4489f2bfd3d61c3db3f1040fbc5cbdbc
Reviewed-by: hjk <hjk@qt.io>
2022-06-16 07:31:00 +00:00
hjk
1c587f136a Valgrind: Use stop() instead of stopProcess()
Change-Id: I9efd3dcec1e894e64fc2684ae2fad5606c90b68f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-06-16 06:48:54 +00:00
Jarek Kobus
c96571ca74 Update qlitehtml
The new head contains a fix for pageUp/Down keys issue.

Task-number: QTBUG-100837
Change-Id: Ifa925f4270fb9106b60dead94cdbf61c5cb38351
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-06-16 06:31:23 +00:00
hjk
43a9278809 Valgrind: Act on pressing Stop
Fixes: QTCREATORBUG-27714
Change-Id: I82b49df8e4ac70e095abbac31fe5fc06d0140e17
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-06-16 06:30:41 +00:00
David Schulz
f81afa4556 TextEditor: adjust default coco colors and controls
Change-Id: I6fa4d5a65067d58e07be974e6ccc349030a03a53
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-06-16 06:24:27 +00:00
hjk
cc4c12b281 CMake: Drop some unneeded includes
Change-Id: I212d518e47529ff0cacdd968c1d09a7f0970c8d4
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2022-06-16 06:19:11 +00:00
Alessandro Portale
17ff9317cd Debugger: Ensure termination of lldb.exe
LLDB 12.0.8, which is included in NDK 23.1, hesitates to termiate when
being told to. Setting UseCtrlCStub to true helps with that.

Fixes: QTCREATORBUG-27723
Change-Id: If14f196cc18f0c6943b59702aca117101b66d02c
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-06-16 06:16:44 +00:00
Christian Stenger
924806e10b AutoTest: Fix catch2 parsing when using prefixed commands
If Catch2 is used with CATCH_CONFIG_PREFIX_ALL the relevant macros
get a prefix. This patch enhances the respective parser to be able
to handle these appropriate.
This does not really take into account whether the define is set or
not, so the parse results will only be correct if the project can
be built.

Fixes: QTCREATORBUG-27704
Change-Id: I935de752ac6106524c45c027af3e0f43673c4578
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-06-16 06:16:38 +00:00
Christian Stenger
3b7029fbdc AutoTest: Fix handling of test cases with comma
Fixes: QTCREATORBUG-27705
Change-Id: I6e22df4e401dc52e8d8599cc8b4de16200093b03
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-06-16 06:16:31 +00:00
David Schulz
a91043d8ba Docker: assert on starting process in non device working dir
Change-Id: I7dd1040c77b3a7f7378b5567b7b5568af5f57848
Reviewed-by: hjk <hjk@qt.io>
2022-06-15 12:59:48 +00:00
David Schulz
a750961f4d Python: make sure working dir is on python device
Task-number: QTCREATORBUG-27536
Change-Id: If9c8f88f2a871ec71b200020689a4ae9df1e8a6a
Reviewed-by: hjk <hjk@qt.io>
2022-06-15 12:11:36 +00:00
David Schulz
d80a713b89 LanguageClient: move relevant snippets to the front
If a snippet starts with the current prefix move it to the front of the
proposed completions.

Fixes: QTCREATORBUG-27566
Change-Id: I568d34e4da596a8cf4f08eb88eb1ee865edbed70
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-06-15 12:11:20 +00:00
Eike Ziller
a7d8698bf2 Fix generating .user files when creating projects
Amends 525ea8a1ec

Change-Id: I04b2e55b986278b93ae88dd3163e63cafefdd546
Reviewed-by: hjk <hjk@qt.io>
2022-06-15 10:52:58 +00:00
hjk
44764bc54e ProjectExplorer: Replace a non-FilePath based mimetype use
Change-Id: Icac2f3b2b79f725151a6947a0a6f544f51b31fd7
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-06-15 09:30:21 +00:00
hjk
56a3afef3c Utils: Remove mimeTypeForFile(const QFileInfo &fileInfo, ...)
Use the FilePath based overload instead.

Change-Id: I048bcbf891f10683428c73130db882253c169333
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-06-15 09:27:39 +00:00
hjk
a29944c68e Core: Remove another use of mimetype from FileInfo
Change-Id: I9f0b789f60c78de059bf10c36aab2d6a60da9f3e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-06-15 09:25:57 +00:00
hjk
5304042d2b QmlProjectMananger: Remove a use of mimeType via QFileInfo
And a bit cosmetics.

Change-Id: I3e64b661d86cadad22422c2bffad0ed1262283b4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-06-15 09:23:39 +00:00
Christian Kandeler
9ecc7b356b QtSupport: Make sure Qt 6 matches a Qt 5 version requirement
... of a wizard.
For example, the QtQuick application wizard specifies "Qt.5.6" as a
required feature, which has the implicit semantics of "Qt 5.6 or
higher". On the C++ side, a QtVersion adds its exact version x.y plus
all lower ones down to x.0, in an attempt to somehow implement
versioning semantics using tags. This means that versions 6.0 and higher
did not fulfill the 5.6 requirement anymore, which was very likely not
the intention.
We therefore extend the mechanism to major version x-1, though in the
future we should probably come up with a less absurd approach.

Fixes: QTCREATORBUG-27612
Change-Id: I41d60809a02f0caddba7e702c91c01e86ecbd4ac
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-06-15 08:44:59 +00:00
Christian Kandeler
71b914b828 ClangCodeModel: Do not dump compile_commands.json into project dir
We can't know if it's safe to put there; e.g. we might overwrite an
existing one.

Fixes: QTCREATORBUG-27573
Change-Id: I928408996759aaccb84332fcf95cf43d7f3bf083
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-06-15 08:43:59 +00:00
Christian Kandeler
56e838da70 CMakeProjectManager: Check for generic ninja error message
... in the output parser.
This improves the user experience for the edge case that the failing
tool did not emit a (known) error message, and does not hurt otherwise.

Fixes: QTCREATORBUG-27606
Change-Id: I74cd327b1daff80ea2f46620e9d169a3db73578e
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-06-15 08:42:35 +00:00
Christian Kandeler
04a23c38f0 ProjectExplorer: Pop up task window on first error
... rather than only at the end of the build process.

Fixes: QTCREATORBUG-27702
Change-Id: I114ef2898f26904e29d96b2cf65dcae4ee9a6121
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2022-06-15 08:38:10 +00:00
hjk
386c462a72 Designer: Use more FilePath
Change-Id: I9571c25c6c3dd430ccd3f7233a4f7290c9ba508b
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-06-15 06:20:30 +00:00
hjk
a9245bf186 LanguageClient: Use more FilePath
Change-Id: Ia4ffec1fd2c6bd8dc2cce40efa49e3b4a4634f15
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-06-15 06:20:22 +00:00
David Schulz
9b08363d82 Coco: update annotation color on font settings change
Change-Id: I7812fccb047d696701d477ae85697facdb1c0361
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-06-15 05:46:44 +00:00
David Schulz
2b428d5de0 Python: prefer python from path when detecting python for document
Change-Id: I794a741fa7257833f0b4efbc25dfae43b8748427
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-06-15 05:44:46 +00:00
David Schulz
02bfd03c22 Python: simplify detect python for document path
Change-Id: I49b943e8b89db32c11b12ee66c0ad3add9a695af
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-06-15 05:44:42 +00:00
Christian Stenger
3341fa827f Debugger: Fix handling breakpoints of same file names
...while qml debugging.

Fixes: QTCREATORBUG-24803
Change-Id: Ieedeb13236f8129a1f6d445de5218462c8d0676a
Reviewed-by: hjk <hjk@qt.io>
2022-06-15 05:27:51 +00:00
David Schulz
601cb16893 Debugger: set the inferior executable when attaching to a run control
The inferior is used to verify that the bitness of the selected debugger
matches the inferior bitness on windows.

Change-Id: Ide7703a1ecc63a7d69101df779ce7f2660fecdbc
Reviewed-by: hjk <hjk@qt.io>
2022-06-15 04:37:03 +00:00
Alexander Akulich
2bf46d9e7f TextEditor: Add an option to hide file line ending combobox
Change-Id: Iae8160f7cd567fc6d42116837fc367fa6dffdc4b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-06-14 20:11:26 +00:00
hjk
525ea8a1ec ProjectExplorer: Remove last use of mimeType via QFileInfo
Change-Id: I7097a1198fd99540bd945ea203bc2033fbcfef6c
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-06-14 15:02:56 +00:00
Christian Kandeler
33f78fa27d QmakeProjectManager: Also consider the "Forms" virtual folder
... for the "Hide Sources and Headers" setting.
A .ui file usually corresponds to a source (and possibly a header) file,
and the user very likely wants the option applied to it as well.

Fixes: QTCREATORBUG-27482
Change-Id: I8652d8a9e7686239bcaef8f90d070c794fd5f993
Reviewed-by: hjk <hjk@qt.io>
2022-06-14 14:26:26 +00:00
hjk
79e467a8b8 CppEditor: Remove one use of mimetype via QFileInfo
Plus some cosmetical changes I could not resist.

Change-Id: Id2634d3876437a5dfe7ddb4aaa53db396f37e02a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-06-14 14:26:10 +00:00
Piotr Mućko
18b8506d4a McuSupport: print created kits
Change-Id: I1fe46347af97c47f960e60541eec1b1ecd8101c8
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Yasser Grimes <yasser.grimes@qt.io>
Reviewed-by: Dawid Śliwa <dawid.sliwa@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2022-06-14 13:58:52 +00:00
hjk
bf8bf1adc0 Utils: Also use device name when trying to disambiguate path displays
With two /tmp/foo.cpp from different devices there is no directly
visible difference in the Open Documents. Adding the device path
for remote cases introduces a difference.

For local files there is no visible difference.

Change-Id: I6f1632d6f51ff24573831af3161492989c5c0bec
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-06-14 13:50:54 +00:00
Christian Stenger
734035194b PE: Move ResourceFileNode to ProjectExplorer
Avoids additional dependencies later on. No functional change.

Change-Id: Idc21ed856f4f31d68d55742b5796243227b254dc
Reviewed-by: hjk <hjk@qt.io>
2022-06-14 13:44:42 +00:00
Christian Stenger
b28f907114 AutoTest: Use QtcProcess for test runner
Change-Id: I29b15a08a260aaf8d2c4071d5ea71d49902d8ef6
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-06-14 13:33:20 +00:00
Christian Stenger
dcbeb354f4 AutoTest: Only display function name if we have one
Should normally not happen, but may happen if we face sanitizer
issues.

Change-Id: I5e99fb99f241e24f507f94bce9009c2212188691
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-06-14 13:33:01 +00:00
hjk
91b8433cbd ProjectExplorer: Remove an explicit mimetype from FileInfo use
Change-Id: I96e6cfcb5c8f42487d693e1a55448b3441d796ba
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-06-14 13:31:05 +00:00
Piotr Mućko
6f2a7d50bc McuSupport: Access ToolChainFactory static member using scope resolution
Change-Id: Iec1863c8f52dc8c7a30535b3c52ac2c661398dbb
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2022-06-14 13:29:54 +00:00
Eike Ziller
fd90cf0a82 Fix debugging on iOS
The RunControl nowadays asks
DeviceManager::deviceForPath(runnable.command.executable) to get the
device, instead of passing that through the runnable.

Since the runnable's command executable is set via
IDevice::filePath(pathOnDevice), where "pathOnDevice" by default is from
the executableAspect, IDevice::filePath should actually return a
"global" path in the form of "device://<device-id>/<path-on-device>".

Since we do not want "device:...." paths for the desktop, return the
simple path in that case only instead.

Fixes: QTCREATORBUG-27709
Change-Id: I75f9406cf3254980e1fee203275b0e72202b7b6d
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2022-06-14 12:59:37 +00:00