Commit Graph

73918 Commits

Author SHA1 Message Date
hjk
6aa94e1e17 Qmake: Show more error if qmake runs but without output
At the same time, use the more descriptive FilePath::displayName()
instead toUserOutput().

Change-Id: I9bcca84b1f0be025c511b6fbf58c7308c9ffd60f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-06-08 10:42:39 +00:00
hjk
08952180a1 Boot2Qt: Fix creation of full command line
Task-number: QTCREATORBUG-27673
Change-Id: Idd1bf676ef7ec0821da938274b03d7529100b2e8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-06-08 10:42:15 +00:00
Evgeny Shtanov
3b373eecd4 reformatCharacter: int to QChar conversion segfault
Debugger, watchhandler: incorrect type conversion:
Converting from `int` to `unsigned int` can lead to a situation where
the result is too large to be represented as a `QChar`.

Task-number: QTCREATORBUG-27107
Change-Id: I7873635f7a1ef29f62339ffe23b4dd84cb089e2b
Reviewed-by: hjk <hjk@qt.io>
2022-06-08 09:56:12 +00:00
Christian Kandeler
49bb40f19e ClangCodeModel: Move "follow symbol" into its own class
Change-Id: Ic64c7275debaa59c524f349fd38460f47f826ecd
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-06-08 09:48:17 +00:00
Jarek Kobus
457fe4eb87 DiffEditor: Drop Utils:: prefix when using namespace Utils
Change-Id: I640447bcd90bba4281b2b945f53c54040060d3bc
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-06-08 09:16:42 +00:00
Eike Ziller
9ab0510eaf Aspects: Update of combo box when changing TriState value
Call SelectionAspect::setValue instead of skipping it and calling
BaseAspect::setValue directly. That takes care of updating the combo box
state.

Amends c8829ff5b3

Change-Id: I55e90459c2b54da09883f746b61b19d46acfdf92
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2022-06-08 07:52:22 +00:00
Tapani Mattila
0b404c9c7a QmlProjectManager: Load QDS landing page content when it is needed
Task-number: QTCREATORBUG-27583
Change-Id: Ib329816f7282b0c6f88d78d62a0c9f34c961e509
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-06-08 07:43:52 +00:00
Eike Ziller
1445e4180f TextEditor: Fix action text
It adds the next match to the selection (as a multi-cursor selection),
not the selection to the next match.

Change-Id: I7520cb3b765562fac2dd45fce5d3b0e4ee7c22c7
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-06-08 07:41:35 +00:00
Xavier BESSON
bcf43e56b4 Label error for line length setting in QML editor
Change-Id: I637ef8b5aebfb05ebe9c132b3c6a60f170337c57
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-06-08 07:31:13 +00:00
Jarek Kobus
f051ed3076 QtcProcess: Add a test for various quit methods
The quitBlockingProcess() test examines different types
of process quitting and illustrates differences in
behavior.

Change-Id: I9209f00576e03eef66fbdf5665351138ed437ac9
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-06-08 06:57:49 +00:00
David Schulz
b4b779d641 TextEditor: fix indent length calculation for rewrapParagraph
Fixes: QTCREATORBUG-27602
Change-Id: I43650be75807c9954eeabca4dbe6749de493f523
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-06-08 05:56:36 +00:00
David Schulz
33167f7f50 TextEditor: use tabsettings to get indent column
Change-Id: I23c84194633ba5cb485fefb6195fcbb3ad37d95a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-06-08 05:56:30 +00:00
Eike Ziller
4ded73583d DeviceShell: Fix compile issues
- fix warning deviceshell.cpp:222:59: warning: suggest braces around
  initialization of subobject
- add missing dependency to app_version to tests

Change-Id: I6d61f26cbc6f51b28175257ab7d0f4d2b491fecb
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-06-07 13:36:25 +00:00
Jarek Kobus
ec63e694d8 DeviceShell: Don't store a shell script on remote side
Execute a script directly on remote side instead.
Storing it always into /tmp/shell.sh may potentially break
when 2 or more shells are being started for one device at
the same time.

Change-Id: I2b8c94ef531fa4916383355a312421a3a18bfcad
Reviewed-by: hjk <hjk@qt.io>
2022-06-07 13:21:06 +00:00
Marcus Tillmanns
b82f321c9a texteditor: Add Select Next Match respect find settings
To increase the usefullness of the function, this change
adds the current search settings to the find() call.

This way the "case sensitive" and "whole words only" is taken
into account when searching for the next occurrence of the
selected text.

Change-Id: Ia4b28e84c39b9298d2dcbfa381ccf19d8137bfc6
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-06-07 12:25:56 +00:00
hjk
4c5f9dcbd4 RemoteLinux: Use more FilePaths in install step
Patch is self-contained, no functional change intended.

The transition is, however, not complete yet as the would break
the consumer side currently.

Change-Id: I04b7d919dffbfb9237863e6166247305c20f1091
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-06-07 11:47:30 +00:00
The Qt Project
f97d72f4ea Merge "Merge remote-tracking branch 'origin/7.0' into 8.0" into 8.0 2022-06-07 10:51:20 +00:00
David Schulz
047a955bac LanguageClient: fix sync with in outline widget
Fixes: QTCREATORBUG-27595
Change-Id: Id5404b90151519baff0024ad3eaca7d2b0a236b0
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-06-07 10:33:28 +00:00
Christian Kandeler
a167bd9ad2 Do not pass Utils::LinkHandler by rvalue ref
There is nothing special about this type that justifies it sticking out
everywhere it appears.

Change-Id: Iccdc95163d477db8a031d0d520f28fea26432a44
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-07 09:22:30 +00:00
Marcus Tillmanns
0135c47849 device: Use multiplex script to allow multithread support
Previously the runInShell and outputForRunInShell methods were
exclusively processed single threaded, meaning all calls
were processed sequentially. With the multiplexed
helper script we can now run multiple processes simultaneously.
( see tst_manual_deviceshell )

Additionally the new script allows us to capture both
stdout and stderr from commands which was not possible previously.

Change-Id: I52f4fb46d872dc274edb9c11872d2f6543741b34
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-06-07 09:22:14 +00:00
Eike Ziller
84ff5eb169 Merge remote-tracking branch 'origin/7.0' into 8.0
Change-Id: Ib669e2e993c4675a7382f721ccb7d6ecff11fc20
2022-06-07 10:28:37 +02:00
hjk
13146fb0bd RemoteLinux: Remove indirection in RemoteLinuxDeployConfigurationFactory
Change-Id: Iec5fc2cc8e31c5a6e2181b62e9b00c46aca94d0b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-06-07 08:15:34 +00:00
hjk
5dddc42f70 ProjectExplorer: Rename column headers in DeploymentDataView
Local and Remote are not quite right anymore, it's more generic
"Source" now.

Change-Id: I06e8985d4515bfeae3c31c8fcff6bd188916df86
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-06-07 07:40:09 +00:00
David Schulz
2029fe8c99 LanguageClient: fix todo
Change-Id: Ia6b3b5fe6e595c32a8b8a13b869f3178afb37ed8
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-06-07 06:29:42 +00:00
Miikka Heikkinen
62ff1c9b52 QmlDesigner: Add material library to 3D application project template
Fixes: QDS-7065
Change-Id: Ifd270312c352d47facd32ff50543003171c0f718
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-06-06 11:38:04 +00:00
Christian Strømme
3335698fba Import3D: Update call to importFile() after change in QtQuick3d
The function in QtQuick3d will from Qt 6.4.0 accept the json object
directly meaning it's no longer necessary to convert to a variant map
first.

Change-Id: If180672963cbfea78582f245431e246f84111c9b
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-06-06 08:52:30 +00:00
Miikka Heikkinen
d0af1c0316 QmlDesigner: Fix typo in module name in subclass checks
Change-Id: I3c235a742450640869128500c21824c7b96a8ee5
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-06-03 14:39:27 +00:00
Miikka Heikkinen
92a3ebd3ef QmlDesigner: Fix crash on project load
Creating material library node in response to model change
notifications is problematic, so don't do that.

Fixes: QDS-7075
Change-Id: Ib688d71223a851b8a98e1c8fcfe598f6decdaf16
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-06-03 13:29:24 +00:00
Miikka Heikkinen
d1a56ddcfa QmlDesigner: Fix issues with quick3d private API changes in Qt 6.4
Change-Id: I5974c7f663262c88810ddaac6f9c775d95749266
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-06-03 13:25:44 +00:00
Christian Kandeler
5693c518bc Utils: Rename ProcessLinkCallback to something less clumsy
Change-Id: Icce4995f4aa886524dc3eedb7cf9ba72adbe8783
Reviewed-by: hjk <hjk@qt.io>
2022-06-03 13:23:28 +00:00
Christian Kandeler
21c215f83c ProjectExplorer: Make BuildSystem:Name variable available
... for use in the default build dir template.

Task-number: QTCREATORBUG-26147
Change-Id: I1a32d60e0d5e2db514ac315c48c615c55ccda51f
Reviewed-by: hjk <hjk@qt.io>
2022-06-03 13:20:08 +00:00
hjk
8d659cb7db RemoteLinux: Slimmer interface of custom command deploy step handling
Change-Id: Iad10d6bd111c9f06adb510aae19e861bbce3425d
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-06-03 12:33:09 +00:00
Christian Stenger
fe63fb2881 GitLab: Add hint what link to gitlab is for
Change-Id: I5ee32fac4a2a73b3b40438d1697071491c17ac94
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-06-03 11:40:37 +00:00
David Schulz
bcfa338fff TextEditor: stop HoverHandlerRunner on focus out
Since we might get a result for a hover request after Qt Creator lost
focus we need to prevent showing tool tips for a Qt Creator in the
background.

Change-Id: Iaa0eafdfe9340d2623fc4632dfc685463fd0d53a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-06-03 11:39:43 +00:00
Fawzi Mohamed
9276523a35 qmljsscanner: fix fallthough in nullish coaleshing
Change-Id: I05c03be4025f7c49d613c350f17cb108ae752ae6
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-06-03 11:28:38 +00:00
Robert Löhning
e9a78b13b3 Squish: Remove exec permission where not needed
These python scripts cannot be executed directly anyway.

Change-Id: I9ac3170450c4f8be4063b02ee8ec9df28f90cec5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-06-03 11:26:08 +00:00
Jarek Kobus
c7c6b70cbe QtcProcess: Add stop() method
This method works like close() with the difference that
after calling stop() we are still going to receive
signals from QtcProcess, especially done() signal.

This method isn't blocking, so a calling it is fast.
Just after calling this method QtcProcess is still
in the same state and done() signal should be delivered
asynchronously. It's safe to call waitForFinished() after
calling stop() with the desired timeout.

Calling stop() in a row with waitForFinished() is a good
substitute for stopProcess().

Change-Id: I1df55beb7f89c9b73203c9ba4bc276a4060600a5
Reviewed-by: hjk <hjk@qt.io>
2022-06-03 10:49:06 +00:00
Eike Ziller
5ffb88bcd2 Add change log for 8.0
Change-Id: Ife947c3f0779a1840b2b4d05dfcee9194be26947
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-06-03 10:45:14 +00:00
Christian Stenger
23ba55cade GitLab: Avoid wrong request
Change-Id: I8be467559c5a742d40b865fa4ffd2c10344ccbba
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-06-03 10:34:34 +00:00
Christian Stenger
ed02ebf615 GitLab: Slightly tweak clone dialog layout
Change-Id: I884c06108515f81f77d00fa6d16821f91be000a1
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-06-03 10:34:26 +00:00
Christian Kandeler
510bbea59a ProjectExplorer: Remove effectively unused enum
Change-Id: Ie4f23e5658e57a367ab77c2cc40443f32a60a8d0
Reviewed-by: hjk <hjk@qt.io>
2022-06-03 10:09:23 +00:00
Christian Kandeler
8690bec140 RemoteLinux: Fix build
Change-Id: I9d16473d7ecdcb05510e8f0f39193fcda8fa10a8
Reviewed-by: hjk <hjk@qt.io>
2022-06-03 10:06:58 +00:00
Mahmoud Badri
8d11ec2656 QmlDesigner: Fix adding the first material to the material library
Fixed that material editor node was not being created when no materials
exist.

Fixes: QDS-7069
Change-Id: I358c497325e8865fc5f012531783dcbe46c32490
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-06-03 10:00:49 +00:00
Mahmoud Badri
6a7f853ec9 QmlDesigner: Switch to components view upon model attach
the "add imports" view looks confusing when it appears upon switching
from edit mode or welcome screen to design mode. Even worse when it
stays after creating a new project.

Change-Id: Ibc3ff1adc7f6b653d443fec2b8f1803d6ac56ed9
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-06-03 10:00:38 +00:00
Christian Kandeler
42e7195185 CppEditor: Remove unused functions
Change-Id: I392930920b536813c9f8fb4969e7f486960aa0cb
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-06-03 09:57:53 +00:00
hjk
5c7925a03c RemoteLinux: Slimmer interface of tarpackagedeploystep handling
Change-Id: Iae162718226182dd5d5af87c2aae260a9f8c7b45
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-06-03 09:42:49 +00:00
hjk
d76458a8b6 Utils: Replace Environment::size() check by some isValid() function
More descriptive, and later implementable without full expansion.

Change-Id: Ic3b17ea0b07273f292827a7b63e7695b4bd1cf23
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-06-03 09:42:26 +00:00
David Schulz
b72f41c7f0 LanguageClient: prevent nullptr access
Change-Id: Ib9838e6912f2f82e4fc9f69f505e2dc9a4c297eb
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-06-03 09:41:01 +00:00
hjk
c6d9ae043b RemoteLinux: Use deploy config id more directly
Closer to the standard pattern.

Change-Id: Ia040de816f20727d772c1d298119a92c184fe28c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-06-03 09:05:30 +00:00
Thiago Macieira
0978d16093 CppEditor: Consider non-canonical path to clang includes
The include directory is under lib64/ on some systems.

Fixes: QTCREATORBUG-27623
Change-Id: Iba16e8ea451b444ab213fffd16f49dae865cd60e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-06-03 08:03:15 +00:00