Commit Graph

62421 Commits

Author SHA1 Message Date
hjk
b323303518 RemoteLinux: Fix deployment when building remotely
By using a generic file transfer method based of FilePath::copyFile()
that doesn't require either of the transfer end point to be the
local host.

Change-Id: Ia2e4273df52f5ce6533046d96be3f6b521b7f0a5
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-10-18 12:21:44 +00:00
Marcus Tillmanns
508dd23de4 Utils: Use Linux quoting in UnixDeviceFileAccess
This forces all commands in UnixDeviceFileAccess to
use Unix style quoting of commands.

Change-Id: Ia8a2691b7058789a7afa95a9bb87f155a36cf680
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-10-18 12:16:56 +00:00
hjk
18670aa74a RemoteLinux: Fix RsyncDeployService::setDeployableFiles()
It previously did not set, but appended.

Amends 515845b815.

Cherry-picked from bf57568880

Change-Id: Ida3bd66e188ad4b1bbf0ea7686ac101a3f61c28e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-10-18 12:15:39 +00:00
hjk
e9ed3d6d05 RemoteLinux: Allow adding Qt to LD_LIBRARY_PATH
When running on the remote build device. And make it work with CMake.

Change-Id: If25bef8ab836c1d59a586116b3c3447a29c4e7e8
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-10-18 11:24:15 +00:00
Marcus Tillmanns
50979f1606 Qbs: Better error messages
Provides more concrete error messages if the executable is not set
or not executable.

Change-Id: I336e9cd10ed6588d77add24af1fd0a9fc9766134
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-10-18 10:54:58 +00:00
Christian Kandeler
0d2e237d65 Update qbs submodule to HEAD of 1.24 branch
Change-Id: I7781942c78d940f35a02fc35ae86435fe6fd22be
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>
2022-10-18 10:51:59 +00:00
Alessandro Portale
93dd15855e ProjectExplorer: Fix JsonWizardScannerGenerator
Both calls of FilePath::relativePath() were "reversed".

Amends: 389b1eceb9

Fixes: QTCREATORBUG-28312
Change-Id: Iecff3adeee8f8ce198c12289e51487a51178759e
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-10-18 10:27:06 +00:00
hjk
053990c357 RemoteLinux: Remove docker related device hack in install step
It's getting into the way with RL->RL setups.

Change-Id: I46e8330293da1ca6dfba00e413518fa3f16ef1d8
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2022-10-18 10:24:44 +00:00
Marcus Tillmanns
7b0b127e90 Docker: Fix deviceshell fallback commandline
Previously the arguments of the target CommandLine were
re-quoted/escaped which is error-prone and not necessary.

Change-Id: I055d159de7860c7cd9549b61104519b8145c4021
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-10-18 09:58:36 +00:00
Marcus Tillmanns
d1284570d6 ProjectExplorer: Simplify node creation
Simplifies node creation by not trying to manually split / concatenate
paths.

Change-Id: I5cb4e9391eb8aef6e6942b8b424ac6ef451d1aff
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-10-18 09:54:15 +00:00
The Qt Project
5b7f5fc093 Merge "Merge remote-tracking branch 'origin/8.0' into 9.0" into 9.0 2022-10-18 09:51:56 +00:00
Ali Kianian
7b796bd4c3 QmlDesigner: Update Placeholder text in 3D Editor
The placeholder text should be modified since there is no
Library View anymore.

Task-number: QDS-6776
Change-Id: I244c7933f1b8c9869aec52d06040e20df5a08459
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-10-18 09:32:33 +00:00
Rainer Keller
98cc93b027 McuSupport: Iterate over target packages directly
The previous code iterates over all packages filtering out every package
that is not in the list of the target.
Instead, the list of target packages can be iterated directly.

Change-Id: I03c9b86b45acca121abe6f2098d6c0e98fc94688
Reviewed-by: Daniele Bortolotti <daniele.bortolotti@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2022-10-18 09:21:06 +00:00
Marcus Tillmanns
9498b736da Utils: Allow Os Type selection for CommandLine
Adds function overloads allowing users to choose the flavor of
command line argument quoting.

Change-Id: I24518162c286114333a93301fedc2a3329cd0c29
Reviewed-by: hjk <hjk@qt.io>
2022-10-18 08:48:47 +00:00
Eike Ziller
ea5a050c5c Merge remote-tracking branch 'origin/8.0' into 9.0
Conflicts:
	src/plugins/mcusupport/mcusupportsdk.cpp
	src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp
	src/plugins/qmldesigner/components/materialbrowser/bundleimporter.cpp
	src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp

Change-Id: I9317da0fc1243b9ce6d87f577aa843c51f132ad7
2022-10-18 10:48:46 +02:00
Eike Ziller
ce6ab1a14d ImageViewer: Improve tool bar size and behavior
Merge the various export functionality into one tool button instead of
three, for this not-so-often used functionality.

Put the actions into a QToolBar, so if the editor area is made so small
that not all actions fit anymore, the tool bar gets the standard
extension button for accessing the "overflowing" ones.

Fixes: QTCREATORBUG-28309
Change-Id: I2e1fcee9414038aca49648f18f61e1f15ecf3e5a
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-10-18 08:08:01 +00:00
Marcus Tillmanns
570a2f75ea Utils: Check shift pressed for directory chooser
Change-Id: I69e9ff2accf51ad7f6327b6708f114a0f87ada42
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-10-18 08:01:20 +00:00
Marcus Tillmanns
e83a6bacb6 Utils: Fix pathchooser for remote directories
PathChooserPrivate::expandedPath has a hack that interferes with remote
paths when they are already absolute. This patch short-circuits it to
keep absolute remote paths intact.

Change-Id: I6438842a693653404aa07160de9f68bdbf22519b
Reviewed-by: hjk <hjk@qt.io>
2022-10-18 07:07:05 +00:00
Marcus Tillmanns
e328c90f4c Utils: Fix code-line lengths
Change-Id: Idc273690600bfbefe9b5913e29c6ac5ea30f4e08
Reviewed-by: hjk <hjk@qt.io>
2022-10-18 07:06:58 +00:00
David Schulz
2e8d2e361c ProjectExplorer: skip cmd autorun for msvc detection
3rd party application like clink can slow down the execution of msvc env
script drasticly. And especially the vcvars script that collects the
msvc environment modifications should be checked without any additional
user modifications.

Task-number: QTCREATORBUG-27906
Change-Id: I7393a3e7e367a26408e52a419ccba75ed8e3cad0
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-10-18 06:50:31 +00:00
David Schulz
89e90f31f1 Python: Do not remove unreachable interpreter on startup
A device might be not reachable at Qt Creator startup so do not filter
out remote python interpreters after loading the settings.

Change-Id: I3ac4f2baaca882e699f2210f6f5a92523891b0ca
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-10-18 06:49:17 +00:00
David Schulz
ef476e538f Utils: replace windows line breaks with unix breaks in deviceshell.sh
Change-Id: I6e07497370360ff04dfec66b55c2e69c0215d235
Reviewed-by: hjk <hjk@qt.io>
2022-10-18 06:40:53 +00:00
Marcus Tillmanns
742f92d246 Docker: Use host.docker.internal
DockerDesktop on Windows and macOS provide the hostname
host.docker.internal to reach the host machine. We use that as its
more likely to work for different setups than trying to figure out
the host ip yourself.

Change-Id: I9f594d0e97e7f35ceb580ac3e3304de999bfea9c
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-10-18 05:39:58 +00:00
Rainer Keller
3499cd79c7 McuSupport: Delete unused widgets
The takeRow() function does not delete any widget. New rows are inserted
using newly created widgets. This results in a memory leak of hidden
widgets.
This change deletes the widgets when removing them from the layout.

Change-Id: Idda877c3cf5c20fc40bfbedb26da11270752e821
Reviewed-by: Yasser Grimes <yasser.grimes@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2022-10-18 04:36:08 +00:00
Rainer Keller
cb1ca97ded McuSupport: Set initial parents for created widgets
Change-Id: I2e1575e848b7480dbabf1193fccfba2596c0f431
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Yasser Grimes <yasser.grimes@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2022-10-18 04:35:30 +00:00
Alessandro Portale
ceee8f4505 Squish: Fix if statement with empty body
Change-Id: Ibf8ab419e26f896e3eabfb9c42c86ca87cd2801d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-10-17 13:37:44 +00:00
hjk
5b287c9210 ProjectExplorer: Avoid prefixing schemes with slash
Without that I get folder nodes named  "/ssh://user@12.23.45.67/..."

Change-Id: I03f87c650478781fe934e8a647a8883f024b7a2b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-10-17 13:19:19 +00:00
Eike Ziller
7d8a140f05 Beautifier: Fix enabling of options
Set the path to clang-format after connecting with the path chooser,
otherwise setting the initial enabled state breaks.
Broke when inline the ui file.

Amends 4933697d9a

Fixes: QTCREATORBUG-28297
Change-Id: I4c6ff7c4515edf13569cf5cd125623005f2967ad
Reviewed-by: hjk <hjk@qt.io>
2022-10-17 13:12:01 +00:00
Christian Stenger
0264aa2a21 QtSupport: Restore some more object names
Change-Id: Ia88dd8e5d3b512227f4d81e01573881afdfbe58c
Reviewed-by: hjk <hjk@qt.io>
2022-10-17 12:38:51 +00:00
Yasser Grimes
b587110cf0 McuSupport: Fix path to QtMCUs not changing
This change will prevent creating a second fileChooser when parsing
QtMCUs package.

Task-number: UL-6612
Change-Id: Ib63ae77a051122ff2ba8656dedbe7ee6fd43e499
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-10-17 12:34:17 +00:00
Marcus Tillmanns
5b3efd61c7 Utils: Move deviceshell script into .qrc
Change-Id: I6acb542163ebe39aaea8a1f1c1b84d355f25eccc
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-10-17 11:50:51 +00:00
Christian Stenger
bdf3c2d576 Squish: Slightly tweak the validation of Squish path
The settings validated so far only whether the given path is
an existing directory.
Check at least the most important indicator whether this path
can be considered valid or not.

Change-Id: I01a35a4e694e309b0fd304c869b6e9d31211f38d
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-10-17 11:17:55 +00:00
Eike Ziller
06402e0dc6 Re-add "Toogle Bookmark" icon into touch bar
Instead of "Edit Bookmark" which was not intended to be there.
Also move it behind the "navigation" items, since these are probably
used more often.

Amends ac47d51bfb

Fixes: QTCREATORBUG-28108
Change-Id: I47c443772488b7f9e29c8fadf01011d4ddfd5686
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-10-17 11:14:05 +00:00
hjk
bf57568880 RemoteLinux: Fix RsyncDeployService::setDeployableFiles()
It previously did not set, but appended.

Amends 515845b815.

Change-Id: Ida3bd66e188ad4b1bbf0ea7686ac101a3f61c28e
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-10-17 10:28:31 +00:00
David Schulz
c7cef250b3 Docker: fix device path mapping
Amends 1fa3255242

Change-Id: Idd2e0916769cd822b97e1fc851d8f706316cca83
Reviewed-by: hjk <hjk@qt.io>
2022-10-17 10:06:52 +00:00
Mahmoud Badri
fdffb6c7d9 QmlDesigner: Fix crash when bundImporter is nullptr
Change-Id: I54436b0199babe53dcaec61c74b34ed72e80ea7b
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-10-17 09:17:53 +00:00
hjk
88837631de Utils: Remove a few QFileInfo uses from FilePath::relativePath
Change-Id: I0896678688cc9f7b1d635890eff0603a89f3b2e3
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2022-10-17 08:53:35 +00:00
Robert Löhning
d95977db90 CPaster: Restore some more object names
Change-Id: I590baed6d2a2ea4a8dd56f471ac7d4d0a015c725
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-10-17 08:51:23 +00:00
Marcus Tillmanns
6961790085 Utils: Fix theoretical use-after-free
Change-Id: I909f2dcd71c2286036f43fce6fc8aa61c55a6695
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-10-17 08:12:58 +00:00
Rainer Keller
2857c73df3 McuSupport: Hardcode the title of the groupbox
The main McuPackage does not provide a title anymore. It was removed in
df92e79da4.
Since then, the title was empty and the second group box showed a faulty
text. This change hardcodes the product name as it is not going to change
very often.

Task-number: QTCREATORBUG-28302
Change-Id: I6180579c9dce2f2f8aa939fb99088b4867d699fc
Reviewed-by: Yasser Grimes <yasser.grimes@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2022-10-17 08:11:52 +00:00
Mahmoud Badri
b983b8aa52 QmlDesigner: Implement unimporting bundle materials
Fixes: QDS-7904
Change-Id: I08642c25a2844547d0104a7b3d9fda6afe47cd38
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-10-17 08:05:50 +00:00
Alessandro Portale
ca4566f3e8 QmlProfiler: Remove access to non-existent TimeInPercentRole
Change-Id: I4b909164d7d69e1fb1902ffde2a89ffdda455751
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-10-17 07:42:33 +00:00
Alessandro Portale
e36ff27403 Tracing: Fix several occurrences of "Unqualified access" in QML code
Courtesy of qmllint via qmlls.

Change-Id: I28c0a8f7ec17a93831fd1f5d9d2de5547a633965
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-10-17 07:42:28 +00:00
Christian Stenger
86d41d58a8 Squish: Restore some more object names
..and adapt test slightly. Fixes generic highlighter test.

Change-Id: I72de310d55ceadc684d15d4e257cd1d90fcf836b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-10-17 07:16:53 +00:00
Eike Ziller
ddd697c371 Don't clear the clipboard at shutdown
No idea how or why that was done, but it is destructive.

Fixes: QTCREATORBUG-28317
Change-Id: I4fe34ce6b40b81c52bbac31ce384b4e2eb3ad983
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-10-17 06:58:36 +00:00
Orgad Shaneh
7c25d1a895 Git: Pass only files after -- on Blame
It works, but is likely to break at some point.

Change-Id: I97952a7cb6cd3569adc694db7537fab807bda0ea
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-10-14 14:01:53 +00:00
Eike Ziller
8db0d3b0ff Fix lupdate issues
- missing Q_DECLARE_TR_FUNCTIONS
- some full qualifications needed for confused lupdate
- avoid breaking some translations from former TaskListPlugin,
  VcsCommand and highlighter settings refactoring

Change-Id: Ia3b34095512a7bad6903f0aff6095313ee39e3e4
Reviewed-by: hjk <hjk@qt.io>
2022-10-14 13:26:45 +00:00
hjk
ec430787e5 CMake: More FilePath in Deployment data
Change-Id: I898a621a34558a28d4688a33aeb9bb9148df6901
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2022-10-14 13:01:15 +00:00
Marcus Tillmanns
a1e960a27c Utils: Fix iterateWithFind
The change of runInShell to take QString + QStringList meant
that the caller was no longer able to fine tune the argument
escaping. This lead to "find -exec ... \;" being escaped incorrectly.

Changing back to CommandLine fixes this.

Change-Id: I55b09bd745c09912a2a0b4e43432824a99c0dd4e
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2022-10-14 12:52:03 +00:00
Christian Kandeler
679a726330 C++ support: Consider project-specific target triple
... before creating project parts.
Otherwise we can get wrong includes and defines from the compiler.
Amends 9c86e6746f.
Also do not add -m32 or -m64 for non-x86 targets.

Task-number: QTCREATORBUG-25615
Change-Id: I02da9251c77d45fc8827990a2d59c3ae2c262591
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>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-10-14 12:30:14 +00:00