Commit Graph

77129 Commits

Author SHA1 Message Date
hjk
0819bf3781 App: Make -version output go to stdout
Fixes: QTCREATORBUG-28327
Change-Id: I0a263ec79ab49a4d1d0816fe798d8a0403e6fce0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-10-19 10:52:57 +00:00
David Schulz
0c7883f384 LSP: Fix translatable error message
Change-Id: I687c58d87e75ac665aaa1817cf5ddd06382008d7
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-10-19 10:30:54 +00:00
Eike Ziller
2f3a6fff93 System settings: Fix translations after context change
The context unnecessarily changed from Core::Internal::SystemSettings
to Core::Internal::SystemSettingsWidget. Change it back.
Some translation were partially updated inbetween, remove duplicates
by prefering the new translations.

Amends dae9cb13cf
and b0847af740

Change-Id: If604c5fa0f40d8f5ac273f01c189ffaf45b67811
Reviewed-by: hjk <hjk@qt.io>
2022-10-19 10:12:56 +00:00
Christian Kandeler
0759f55c00 ClangCodeModel: Make use of clangd's new "definition" modifier
See https://reviews.llvm.org/D127403.

Change-Id: I791b2396266810bfb3610a9f37565e4f01d67879
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-10-19 10:09:16 +00:00
Cristian Adam
1c51dc1adf CMakePM: Do not use systemEnvironment() for CMakePresets
This doesn't mean that CMakePresets will work with a remote project, but
at least it avoids Environment::systemEnvironment() usage.

Change-Id: I17081c747d32e50224ac74507d3aa336ff5c8948
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2022-10-19 10:08:06 +00:00
Eike Ziller
fdee55643a New dialog: Fix translations after refactoring
The translation context unnecessarily changed. Change it back.

Amends 4e7ee4687b

Change-Id: Iee0f862bc492c6e90d58050d8a217eb9d485a2ee
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-10-19 09:59:34 +00:00
Mats Honkamaa
029f926bcf Doc: Fix 3D effect docs
Task-number: QDS-8026
Change-Id: Ic59b58e8d0c033b2fc6ec1e18d0ca4ddcfe63699
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-10-19 09:57:26 +00:00
Thomas Hartmann
5ca3db5ff7 QmlDesigner: Fix crash
We access the rewriterView() for the decription.

Change-Id: I30883d02ab1a2b12dcd6a2bcac6fae82b97a2f5b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-10-19 09:45:51 +00:00
Thomas Hartmann
1523129d50 QmlDesigner: Add helper function to StylesheetMerger
Change-Id: If3857af4a3541cb1b77a87d168f33571954dd5e4
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-10-19 09:45:41 +00:00
Thomas Hartmann
ea13277c7a QmlDesigner: Fix StyleMerger for custom types
If the template uses custom types they are only found if
we register the correct fileUrl.

Change-Id: Ia358a39d5c5c5bbcaf403ae3c250495ddadfc326
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-10-19 09:45:32 +00:00
Cristian Adam
23092b57b8 CMakePM: Use filePath().deviceEnvironment() to find ninja
Amends 45ec26783f

Change-Id: I05b52295841d60ff693d6e7b12c9e4ceaf0f09eb
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-10-19 09:32:23 +00:00
Orgad Shaneh
f696d1e6cf DiffEditor/VCS: Save document before applying/reverting patch chunk
Fixes: QTCREATORBUG-22506
Change-Id: I646f24068c0c81890f36052537320a743fdeb498
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: hjk <hjk@qt.io>
2022-10-19 09:31:48 +00:00
Cristian Adam
ae07c31976 PE: Clean environment before compiler environment detection
By calling vcvarsall.bat with "/clean_env" before the actual
vcvarsall.bat call we make sure that the correct environment settings
are picked up by Qt Creator.

For example calling Visual Studio Community/vcvarsall from an
environment where Visual Studio BuildTools/vcvarscall was already
called, will not return a Visual Studio Community environment, but a
Visual Studio BuildTools environment.

The above scenario can happen when developing Qt Creator itself with a
different Visual Studio setup.

Fixes: QTCREATORBUG-28315
Change-Id: Ib99cbba2a5c6299953728e92cf0283c10f7837f3
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-10-19 09:11:20 +00:00
Marcus Tillmanns
6dd15ef3f3 ProjectExplorer: Ensure working dir is reachable
Previously the working directory might not be reachable by
the executable.

This change fixes that by calling "ensureReachable", and
changing the path to an on-device path of the exectuable.

This also fixes the path when the Host is Windows, and
the build device is a unix type system by changing the paths
from e.g. "c:/..." to "/c/..."

Change-Id: I6c86e16c867bb654b6c2a4951d9f62fdb879298e
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-10-19 08:56:35 +00:00
Cristian Adam
389d2acd87 Utils: Add arm64 support for qtcassert's dumpBacktrace
Change-Id: I91918689b2d2cde89f7879c482c7826eb55f1c16
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-10-19 08:47:54 +00:00
Marcus Tillmanns
4cab804e85 Utils: Don't return self during find
find can return the directory that is searched in as
one of the results. We need to filter it out.

Change-Id: If2902497e67d3a7a216430e725ec86227a392ccb
Reviewed-by: hjk <hjk@qt.io>
2022-10-19 08:23:10 +00:00
Eike Ziller
638e73e4f8 Clangd indexing: Hide cancel button, open settings on click
Since we cannot reasonably "cancel" indexing, hide the cancel button
from the progress indicator.
Open the Clangd settings page when clicking on the progress indicator
instead.

Fixes: QTCREATORBUG-27744
Change-Id: I625464e7f7456bcf7f01ce7e52f6bd6b53e3d8b2
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-10-19 06:24:54 +00:00
Orgad Shaneh
7edf743583 Merge remote-tracking branch 'origin/9.0'
Change-Id: I5e6cfc111941f9609285e1b802121644fa8cdaac
2022-10-19 09:12:14 +03:00
hjk
ada6989079 RemoteLinux: Allow use as build device unconditionally
Works out-of-the box for plain C++ "Hello World" & CMake.

Change-Id: I696886582ad2db98e40dd31ad5d9bf8f7d30aabb
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-10-19 06:01:55 +00:00
Orgad Shaneh
0dd8d64060 Revert "ProjectExplorer: Simplify node creation"
It breaks the project tree, at least for Qt Creator CMake project.

This reverts commit d1284570d6.

Change-Id: Ic5fe14cd4da476ca421551968e67fb8688433bbf
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2022-10-19 05:39:15 +00:00
Jarek Kobus
d85dd1962b QtcProcess: Disconnect from ProcessInterface signals
... on destruction.

Change-Id: I6751e1ba2999f506e85ebb697a8a1c7152ea9abb
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2022-10-18 16:48:43 +00:00
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