Commit Graph

62421 Commits

Author SHA1 Message Date
Jarek Kobus
5a32e9942d Don't use terminal mode in SshDeviceProcess by default
Amends e2cb64471a

Change-Id: I61d49a9b738ff07ce5f632f6411dd49fc84b9f6a
Reviewed-by: hjk <hjk@qt.io>
2022-02-15 09:58:15 +00:00
hjk
c87a066087 Docker: Fix endless ping-pong between runnProcess and start
Amends 95c9579c58.

Change-Id: Icee747a578e000a0477dc314500687316f4ecd6b
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-02-15 09:31:57 +00:00
Jarek Kobus
7a45f7f01f Make SshSettings thread safe
Change-Id: Iac07ee51574c348a22c6a966eb2113c53402b88d
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-02-15 09:17:08 +00:00
hjk
f7a585fad9 FileUtils: Add some helper to handle ls-style output
Unix-ish device implementations would otherwise repeat that code.

Change-Id: I1265fe1a69e55409ab2875d0b6f6113ec92edd79
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-02-15 08:57:19 +00:00
Christian Kandeler
d465dd9f3b ProjectExplorer: Linkify main diagnostic location in MSVC output parser
Task-number: QTCREATORBUG-27056
Change-Id: Ide66fd1ee9c8312653146cfa4a17ec6f662a7949
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-02-15 08:53:45 +00:00
Björn Schäpers
48ce753a05 Debugger: Fix Segmentation Fault on Windows
This amends 035b8aa5f7. shutdown() is
called from GdbEngine and from OutputColloector's Dtor. Thus there is a
change we access m_socket, after it is nullified.

Change-Id: I7d26ded70d0b148d83eb551edaf9b82850db197e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2022-02-15 08:28:07 +00:00
Mahmoud Badri
42f260747e QmlDesigner: Update expand state upon renaming
Upon renaming an asset folder, update the expand state so that the
renamed folder receives the correct expand state.

Task-number: QDS-6200
Change-Id: I9868cb3e342a8a8488ed0b5a62735bc8af468dfe
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-02-14 17:13:30 +00:00
Mahmoud Badri
d1fd23100a QmlDesigner: Fix assets library warning case
Fixed a warning that appears if the search moves from the
"no match found" case to a match case. Also added a small optimization
to searching.

Change-Id: I9e4759fe00959bcbe1a7018c1bdc6cc43069fca7
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-02-14 17:12:33 +00:00
hjk
f78f0cc6cb Utils: Avoid accumulating .exe extensions
Change-Id: If635638a89c96b09b17d22d7e7400a046ae320e9
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-02-14 16:55:44 +00:00
Christian Kandeler
fa071d03cc ProjectExplorer: Fix accumulating .exe suffixes
... when trying to detect GCC on Windows.
Also make the code device-correct.

Fixes: QTCREATORBUG-27057
Change-Id: Iaaa25c152a1cf0e0f05cd6d6db629b7a72b25166
Reviewed-by: hjk <hjk@qt.io>
2022-02-14 16:26:59 +00:00
Jarek Kobus
ce40605934 ProcessInterface: Remove program() method
It looks it's really unneeded.

Change-Id: Ie9447abfbe57968e5f5302be6b23cb950c4d0ea7
Reviewed-by: hjk <hjk@qt.io>
2022-02-14 16:24:56 +00:00
Jarek Kobus
a3ff220f5b Drop ::ExitStatus:: and ::ProcessError::
That's superfluous. Fix comparison of QProcess::exitCode
with QProcess::ExitStatus.

Change-Id: I49d746fdbbc279e3e04c4ed57d386560e7cbe4b4
Reviewed-by: hjk <hjk@qt.io>
2022-02-14 15:19:44 +00:00
Jarek Kobus
6f1285f508 ProcessInterface: Use Environment and FilePath
Use Utils::Environment for of environment.
Use Utils::FilePath for workingDirectory.

Change-Id: I6b717139f8ff7ddbd629fb22cf816b2303fb5e6a
Reviewed-by: hjk <hjk@qt.io>
2022-02-14 15:16:30 +00:00
hjk
95c9579c58 ProjectExplorer: Normalize DeviceProcess::start() signature
Change-Id: I2915be34d4a1eed64567874dcf0263b7583cc142
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-02-14 15:10:12 +00:00
The Qt Project
380d952221 Merge "Merge remote-tracking branch 'origin/7.0'" 2022-02-14 12:53:55 +00:00
Miikka Heikkinen
c2db646c6e QmlDesigner: Properly set metatype hints on Model import
When 3D import results in a .qml file with Model as root item,
metatype hints are now set to correctly treat the item as 3D node.

Fixes: QDS-6206
Change-Id: Iaad0d37bcd93eefca87b6c09f6e4f398064fba90
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-02-14 12:39:48 +00:00
Jarek Kobus
fd36b4a501 Make ProcessInterface public
It's going to be subclassed in LinuxDevice.

Change-Id: I6308d7cf75a7e16cd02de585612000a1b983fadc
Reviewed-by: hjk <hjk@qt.io>
2022-02-14 10:57:27 +00:00
Tim Jenssen
f9cceb6267 qds: remove redundant "QtStudio" feature
Nowadays, the decision which wizards will be shown are
done throw the StudioWelcome plugin if it is initialized or not.

Change-Id: Ief95fa8f813408522ac43c31dd6f4ffb069338d0
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-02-14 10:33:26 +00:00
Christian Kandeler
30847a9684 Fix build with Qt 6
Amends 14ee4654c1.

Change-Id: I07d4de825fc16727ae71e5fa519074dddf4b4f80
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-02-14 09:51:44 +00:00
Fawzi Mohamed
b22ca3c467 qmljs: fix scan out of build dir
Scan outside the build directory was possible on mac and windows.
Avoid it by checking the relative path to the build directory.

Change-Id: I6a7082998429f902745146446bf89fc0cc75ca54
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
(cherry picked from commit bdd7fcbac2)
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-02-14 09:49:12 +00:00
Christian Kandeler
e5f8fe311d ClangCodeModel: Remove fallback code for clangd < 13
Amends 4dfdbf91f6.

Change-Id: Ie8657329380e83aeb76503e360afa5ebf0e60fbb
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-02-14 09:29:34 +00:00
David Schulz
5b307634c3 LanguageClient: fix race condition on client shutdown
If a document is closed between removing a closing client from the
tracked clients in the LanguageClientManager and the actual destruction
of that client we might derefernce an already desctructed document in
resetAssistProvider.

Connect the document closed signal in the client instead of the manager
so Client::closeDocument gets called even if it is not tracked in the
manager anymore.

Fixes: QTCREATORBUG-26534
Change-Id: I7187730600eeb1df54355065eb9cb703a605139e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-02-14 09:03:51 +00:00
Alessandro Portale
8dcb5097f5 Utils: Ensure that VariableChooser window title bar stays on screen
Prevent negative y-coordinates when centering the VariableChooser
over the launching toolbutton.

Fixes: QTCREATORBUG-27054
Change-Id: I4212c7120470f8c2014fbe27205de8430cd13a6f
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-02-14 09:01:05 +00:00
Eike Ziller
45b5341cd9 Merge remote-tracking branch 'origin/7.0'
Change-Id: Iab67dffe64bee391bd921ed8832bb17b36ec861b
2022-02-14 09:58:04 +01:00
Christian Kandeler
81218043d0 ClangCodeModel: Fix mis-highlighting of lambda calls
Calls to lambdas without arguments that are declared as const variables
were erroneously displayed as output arguments.

Change-Id: Ibd914431a34157606694f85d8e00c0dd1db1a618
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-02-14 08:43:18 +00:00
Eike Ziller
bb59a00229 Fix issues with showing code pasting URL
- use common signal for posting output for fileshare protocol, so it
  correctly behaves wrt the settings
- flash even when not opening the output pane when showing the output
- MessageManager::writeDisrupting should switch the output pane even if
  another output pane is currently open (which enforced with
  IOutputPane::WithFocus)

Fixes: QTCREATORBUG-26975
Change-Id: I51586eaca826f81f7e72f147fce7e72cbf639c6c
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-02-14 08:08:20 +00:00
hjk
f555285aa5 Utils: Fix compilation on Windows
Amends 825c89987c.

Change-Id: I1ec04bcc8b67870bdc26dccb4e67052a32c7ef94
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-02-14 05:44:24 +00:00
hjk
e2cb64471a Utils: Move QtcProcess constructor setup data to shared setup data
This includes replacing DeviceProcess terminal handling with base
member.

Change-Id: Id1541bfce33c71dddc71b4816ad0b174dce3879c
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-02-11 17:33:48 +00:00
Thomas Hartmann
dd6d6263d4 QmlDesigner: Shorten the visual block of form editor view
Since we cache now the images from the puppet 100ms are sufficient.

Change-Id: Ibf5bd40cb4d5d9c249db8ac4a2c5e60e31df3504
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-02-11 16:36:42 +00:00
hjk
825c89987c QtcProcess: Delay calls to newProcessInstance()
I'd really like to keep/re-enable at least the terminal use
as kind of property not directly tied to the QtcProcess object
life time.

This here is a first step towards this goal (and only a sketch)

I am not sure whether I like using a pointer to a "parent"
data struct as a means to propagate data, but it works, and
it's easy to add a new data item without touching all lower levels.

Change-Id: Ice2d3246951438a14383b097f307fd61306c29db
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-02-11 16:11:43 +00:00
Henning Gruendl
c2cd524cdb QmlDesigner: Add functionality to welcome plugin
* Add extraction progress and birth time
* Add URL probing in downloader
* Add last modified and available information
* Overload openExample() function

Task-number: QDS-6174
Change-Id: I68782629da3ec4da5aab95d00510b7bc7085aa66
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-02-11 15:51:41 +00:00
Christian Stenger
39db18f968 QmlJS: Soften strict equality check Pt III
Adapt to differences Qt5 vs Qt6.

Fixes: QTCREATORBUG-25917
Change-Id: Ieee1cf0442016c62b82bd932dd62d0dc9a78bc26
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@qt.io>
2022-02-11 15:44:22 +00:00
Thomas Hartmann
125ac37724 StudioWelcome: Only show project folder path
The project file name is usually the same as the folder and does
not add extra information.

Task-number: QDS-6169
Change-Id: I2673a30130cd73daa7bb6811b00e1cb05ee2444c
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-02-11 14:29:26 +00:00
Fawzi Mohamed
bdd7fcbac2 qmljs: fix scan out of build dir
Scan outside the build directory was possible on mac and windows.
Avoid it by checking the relative path to the build directory.

Change-Id: I6a7082998429f902745146446bf89fc0cc75ca54
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-02-11 13:17:18 +00:00
Christian Kandeler
fde7b90ee9 Fix some warnings
Change-Id: I2991f0ab84b26c93c0dbe2ec79f7638d299e3d39
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-02-11 12:14:27 +00:00
Henning Gruendl
92c786d21e QmlDesigner: Add new color values
Add DSgreenLight, DSamberLight, DSredLight colors

Task-number: QDS-6174
Change-Id: I59e745aabc8b8182c36027f875af7709f8c62060
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-02-11 11:35:28 +00:00
Henning Gruendl
3688ee17fc QmlDesigner: Add new icons to icon font
Add downloadUnavailable, downloadUpdate, downloaded icons

Task-number: QDS-6174
Change-Id: I473cd786b3eb12aeb79b737141a7bb8da381e0e5
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
2022-02-11 10:42:01 +00:00
Eike Ziller
fcb8d3b2a4 Merge remote-tracking branch 'origin/7.0'
Conflicts:
	src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp

Change-Id: Icda34067bb89d066a3e7eb47f8cca1d62dc3ae0d
2022-02-11 11:20:13 +01:00
Christian Kandeler
7123a41c1e ClangCodeModel: Improve ifdef'ed out code handling with clangd
- Made code more self-documenting.
- Added more comments.
- Added debug output.
- Rewrote ugly redundant code checking for #ifdef & friends.
- For consistency, emit update about ifdef'ed code only
  if we also report the other highlighting results.

Change-Id: Idd3cbd3c169343bcaf6b6b19330130378ac6c5d0
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-02-11 10:11:25 +00:00
Christian Stenger
07506ab695 KSyntaxHighlighting: Fix qbs build
Amends 37f8fcd791.

Change-Id: I0734e26fc8015eb31d6cbbd86444179ee14c8304
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-02-11 09:58:48 +00:00
The Qt Project
5a278d78f2 Merge "Merge remote-tracking branch 'origin/6.0' into 7.0" into 7.0 2022-02-11 09:51:03 +00:00
Orgad Shaneh
b0d572789b Git: Fix assertion when upstream branch no longer exists
Change-Id: I5033d43571026ab0d9b8b94892b4075e130211be
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2022-02-11 09:50:09 +00:00
Eike Ziller
b98de260e3 Merge remote-tracking branch 'origin/6.0' into 7.0
Change-Id: I61bc71d3a4e786b5392aed408f0efe4d28fe7e67
2022-02-11 10:49:15 +01:00
Christian Kandeler
ce27886eeb ClangCodeModel: Fix dot-to-arrow completion with extra characters
We failed to overwrite existing characters that match the completion if
clangd also changes "." to "->" at the same time.
Note that it still doesn't work as expected if the cursor is after the
dot and before the extra character. I'm not sure yet how to fix that.

Fixes: QTCREATORBUG-27034
Change-Id: I852145fc41f34ab60d9e944783e822bc9505453b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-02-11 09:43:48 +00:00
Thomas Hartmann
9e0b7a0d60 QmlDesigner: Do not update instantly after creating component
If the update happens instantly the new component is not
parsed in sone cases, yet.

Change-Id: Ib43fc5e3dfd2e14f87a9e4fb46b1e2ba720768a5
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-02-11 09:25:39 +00:00
Christian Stenger
4c7a5b07c1 Docker: Fix and enable open shell in container
So far this had been restricted to Unix, but it works on
all platforms.

Change-Id: I578623341c906eca80a0dbc5fcc9b15e820d3597
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-02-11 08:57:52 +00:00
David Schulz
37f8fcd791 Editor: update ksyntaxhighlighting engine to v5.90.0
Task-number: QTCREATORBUG-22558
Change-Id: I7314c146a6de359ea8d60750d8a2c8e972b33fc9
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-02-11 08:00:00 +00:00
Eike Ziller
a9c5d6b99f Fix accelerator/mnemonic conflicts in advanced search
Fixes: QTCREATORBUG-26914
Change-Id: I260e2dac92a2e2cac8d7a0cda111fe38d9265d19
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2022-02-11 07:35:36 +00:00
Alessandro Portale
26bf18e1fe Core: Turn LocatorFilterEntry ofn ILocatorFilter::accept to const &
In ILocatorFilter::accept and all the overrides.

Change-Id: I27cd6babb66d91aad57e85572a1cdc77aef4fd79
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>
2022-02-11 07:35:30 +00:00
Erik Verbruggen
93fc6b5c3c McuSupport: Make all member fields of McuTarget const
In proactive, the color depth was never changed after setCMakeOptions
was called. This change makes it clear that it is also not intended to
be changed: a board does not suddenly change color depth, and for a new
board configuration a new target is created.

Change-Id: Ie5b99726d833efcdf129655b8e70120a033914e6
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-02-10 21:19:07 +00:00