Commit Graph

76958 Commits

Author SHA1 Message Date
Marcus Tillmanns
5c7c3a410d ProjectExplorer: Use device env when inspecting gcc
Previously the host environment would be used while inspecting
a gcc / g++ compiler. When doing so on a Windows Host
against a Docker target, this would fail.

Change-Id: I0e7b392101cee23e17813fa07f6c04bb9d3999c9
Reviewed-by: hjk <hjk@qt.io>
2022-10-18 16:18:07 +00:00
Thomas Hartmann
3be3663bf7 QmlDesigner: Do not compare type names for file components
For file components the fully qualified type name is not properly
defined and the component is created from source anyway.

Task-number: QDS-7992
Change-Id: I2c2754c1bab53257a210c2e4de990a0a768618a3
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-10-18 15:31:40 +00:00
Thomas Hartmann
edd07ff986 QmlDesigner: Delay project preview generation by 10 seconds
This way the preview generation does not block opening the project
and the project is fully loaded. If the preview is null
we store this in the data base and wait one hour until we
try to regenerate it. Otherwise we might try to render a preview
whenever we switch files.

Task-number: QDS-7992
Change-Id: I80a078ec7b8d418fa1fccd14bc4603b82c36c5e0
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-10-18 15:31:32 +00:00
The Qt Project
f1fc14acc9 Merge "Merge remote-tracking branch 'origin/9.0'" 2022-10-18 14:58:14 +00:00
Mahmoud Badri
e55ea179c4 QmlDesigner: Extract material browser ctx menus into separate components
Change-Id: I43305567f5224ed8015bcb507c7ee27e268d4d67
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-10-18 14:54:32 +00:00
Eike Ziller
3bdb1a3edf Merge remote-tracking branch 'origin/9.0'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp
	src/plugins/vcsbase/vcscommand.cpp

Change-Id: I2d33113bfb2ea7134550cda1de4e2c21e6711778
2022-10-18 16:51:36 +02:00
Thomas Hartmann
d3e83f601e QmlDesigner: Fix test testRewriterSignalDefinition
Otherwise the check if the property was handled will throw an assert.

Change-Id: Ifc2fab22cd10ae811cd36137196c1ed6ba82677e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2022-10-18 14:42:41 +00:00
Marcus Tillmanns
f7a2132598 CMake: Don't filter out new keys
Previously, if you have a filter set in the CMake Settings
variable list, adding a new one would immediately hide it,
as the text filter hides the "<UNSET>" key. This made it look
like the adding failed.

With this change, new Variables are always shown so
they stay editable to user.

Change-Id: I9c2eb7f9983b23e1cd3aa50f589142551caaf56f
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2022-10-18 14:29:54 +00:00
Eike Ziller
9316f43efe Add change log for 8.0.2
Change-Id: I73f5039b6388d3132564d86fa8c1515dd6345e8e
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-10-18 14:29:45 +00:00
Marco Bubke
2ba40d5ea9 QmlDesigner: Move code to compile time
Instead of initialize code at run runtime we can do that already at
compile time. And because Qt has already QStringView overloads we can
use them.

Change-Id: I2a6a2c45d6c5cd1af2c64e32deeb3d4ff81c9ee0
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-10-18 14:22:49 +00:00
hjk
4266f612e6 Utils: Rename FilePath::relativePath() to relativePathFrom()
Hopefully less confusion about the direction.

Change-Id: I61727d6c4d19e0dfe46f24ff24f5d90f9835d05c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-10-18 13:41:24 +00:00
Alessandro Portale
54f7ebf001 Utils: Fix missing DetailsWidget outline
On some systems, QPalette::Midlight can have the same color as the
background color. So instead of using QPalette::Midlight on non-macOS,
mix our own color with 15% text color intensity, to visually match what
Qt Creator < 9.0 did.

Change-Id: I40848b5e16344c07f42c20415194f893641d5f70
Reviewed-by: hjk <hjk@qt.io>
2022-10-18 13:33:15 +00:00
hjk
d47a72e26c CMake: Use the OS of the source directory as ${hostSystemName}
In case of building on a remote system  CMake considers this remote system
as host.

Change-Id: Ifb9d0b2a2c4c49ba4ee009795f5b432c7b951e0d
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2022-10-18 13:26:01 +00:00
Eike Ziller
471b036803 CommandButton: Fix build with older Qt versions
Make sure QAction is included not only accidentally via other Qt headers.

Change-Id: I946bcdc852989f50d1464393013169c00aa8172f
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Sivert Krøvel <sivert.krovel@qt.io>
2022-10-18 13:22:14 +00:00
Eike Ziller
101ef19d1e ImageViewer: Show current default settings in tooltip
List the current default settings in the tooltip for the "Set as
Default" button.

Fixes: QTCREATORBUG-28322
Change-Id: Ic3a21218a60821e328d6db2375a0e5a08616d686
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-10-18 13:08:58 +00:00
Orgad Shaneh
1478a36530 ProjectExplorer: Fix prepending executable path for custom toolchain
Amends c60c642fe5.

Change-Id: I214c3d83ef5f1642d581e84f9219e929d765c471
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-10-18 12:56:58 +00:00
Robert Loehning
f27444a213 Doc: Rephrase code snippet description
...to also cover the case of writing new bug reports.

Change-Id: Ia98231c836df256313f7b7cb42f3e05bf3b8866b
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-10-18 12:41:32 +00:00
David Schulz
60a8e987b5 Docker: use docker device os type for file access
Change-Id: I3e3e91491c77d0146f2d52777ba1d05d2f45a9d3
Reviewed-by: hjk <hjk@qt.io>
2022-10-18 12:37:50 +00:00
Leena Miettinen
4ebfd4b6cf Doc: Update instructions for adding B2Qt Devices
Update screenshots to use the dark mode.

Task-number: QTCREATORBUG-27876
Change-Id: I1b6483f76d7f14485ffc13b465e84f378494ea3f
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-10-18 12:27:23 +00:00
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
Jarek Kobus
ac3a7991ff DeviceUsedPortsGatherer: Simplify internals
Change-Id: I846022c67b8cc815f7fa271614b4baf7628bba3b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-10-18 11:18:07 +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
Mahmoud Badri
4667d8ae4e QmlDesigner: Disable "add material" actions when QtQuick3D not imported
Fixes: QDS-7516
Change-Id: Id92a76e455b17b6c7baa11f8e472fa0b6bfcde9f
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-10-18 10:29:18 +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
Fawzi Mohamed
d8987a1042 qmljseditor: remove unneeded import
Change-Id: I99da4f9083759041da1a839f6f451a4a4bd787ca
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2022-10-18 08:17:05 +00: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
Miikka Heikkinen
6276f5514d QmlDesigner: Add QML/QtObjectPane.qml
In Qt 6.4 QtObject module resolves as QML, so add corresponding
property pane.

Fixes: QDS-7059
Change-Id: I115bd871132839dc170add254055022840176989
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-10-18 07:28:19 +00:00
Miikka Heikkinen
fdf1baecd6 QmlDesigner: Create asset_imports directory at project creation
Some watchers won't be initialized correctly if the folder doesn't
exist at project startup. E.g. texture images won't appear in project
view when material with textures is imported, unless asset_imports
already exists at project load.

Task-number: QDS-7813
Change-Id: I79449ae823d9005e74594f08bfa87abf44045caf
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-10-18 07:28:06 +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
93c15f48dc Editor: ensure cursor is visible after handling backspace
Fixes: QTCREATORBUG-28316
Change-Id: I1e8c9229704c700ad76f6906b1a220948c819c1b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-10-18 06:49: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
Leena Miettinen
31e24208b5 Doc: Describe using CMake presets for configuring and building
Update screenshots.

Task-number: QTCREATORBUG-27876
Change-Id: I62135a0254b730b2cbbad65f5bac7b1594ee454e
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2022-10-18 06:38:57 +00:00
Leena Miettinen
8aaf60218c Doc: Add alternative terms for "shadow build" to the glossary
Change-Id: I36e160840520778f5ef7012ef72fb1abb967a3c5
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-10-18 06:38:43 +00:00
Orgad Shaneh
890b85d17e VCS: Simplify promptSubmit a bit more
+ fix regression for Git, which allowed to commit invalid commits.

Amends commit 9b61e484be.

Change-Id: I7571863bb982bfae1aa040e08f8c68010b14b147
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2022-10-18 06:31:53 +00:00