Commit Graph

76860 Commits

Author SHA1 Message Date
Eike Ziller
635d293ce2 Make progress details and toggle button more visually connected
By using the same background color.
If the progress details and the toggled button have different background
colors, it makes it visually more difficult to realize that they belong
together.

Task-number: QTCREATORBUG-28078
Change-Id: I7ce8c5702b10e10ea81b644d5ea4f7ebcfb8c223
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-08-31 10:57:31 +00:00
The Qt Project
3020a93709 Merge "Merge remote-tracking branch 'origin/8.0'" 2022-08-31 09:42:49 +00:00
Cristian Adam
f866b03b19 CMakePM: Do not use displayName for build directory
This code path was used when adding a new build type from settings via
Add -> RelWithDebInfo and it would be expanded to "Release-with-Debug-
Information".

On Windows this can lead to long paths and problems.

Change-Id: Ie6ab74414778a2e723bfa08d6765292dfe6bce22
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-08-31 09:27:50 +00:00
Jarek Kobus
41cefa6a2b LinuxDevice: Fix kill command on remote host
Kill all the processes in the process group.
For more info see:
https://man7.org/linux/man-pages/man1/kill.1.html
https://www.baeldung.com/linux/kill-members-process-group

Fixes: QTCREATORBUG-28072
Change-Id: Id574774d16bc7d3386c6c5f80fb1d305065ec3dc
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-08-31 09:20:40 +00:00
Eike Ziller
a2f21d40f5 Merge remote-tracking branch 'origin/8.0'
Conflicts:
	src/plugins/debugger/debuggerdialogs.cpp
	src/plugins/qmldesigner/components/materialeditor/materialeditorview.cpp
	src/plugins/texteditor/fontsettingspage.cpp

Change-Id: I5a6accd2065e0d8320045b57ade7b54a9a09aae0
2022-08-31 11:03:13 +02:00
Christian Kandeler
02a76947a5 ClangCodeModel: Adapt test to upstream change
Apparently, friend declarations now get the "declaration" modifier.

Change-Id: I30255d9953c96f2579a3fc66232a21edf406a01a
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-08-31 09:01:20 +00:00
David Schulz
ad4fed86ca Editor: improve painting multiple mark icons per line
Instead of painting them visually on top of each other paint them in a
grid with a number indicating how much marks are in total in that line.

Fixes: QTCREATORBUG-27415
Change-Id: Ifbf35c956670976b54e5084569d77a6f9e7f59a7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-08-31 08:21:17 +00:00
Eike Ziller
54bce73089 Core: Use qtcEnvironmentVariable* instead of qEnvironmentVariable*
And instead of qgetenv.
Takes Qt Creator's setting at "Environment > System > Environment" into
account, which makes it easier on some platforms to set them (e.g.
macOS), can be configured differently in different settings paths, and
potentially can be changed at runtime (depending on usage).

Change-Id: Idfc8a7e255b4a0527f4651d6f9e5334e95b4351f
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-08-31 06:27:33 +00:00
Eike Ziller
d5bacfc087 Debugger: Use qtcEnvironmentVariable* instead of qEnvironmentVariable*
And instead of qgetenv.
Takes Qt Creator's setting at "Environment > System > Environment" into
account, which makes it easier on some platforms to set them (e.g.
macOS), can be configured differently in different settings paths, and
potentially can be changed at runtime (depending on usage).

Change-Id: I3ea7623fb528e13a202afa2f89b00e5ee83962d8
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-08-31 06:25:01 +00:00
Eike Ziller
a29ee883ae Auto-detect ccache compilers on macOS
From some standard locations. When installing ccache with Homebrew, it
is installed in architecture dependent directory and links are
automatically created. When installing ccache with MacPorts, no links
are created, but the MacPorts wiki at trac.macports.org has a suggestion
for a script that creates them at /opt/local/libexec/ccache in its howto
section.

Fixes: QTCREATORBUG-27792
Change-Id: Ib173f81384a03b867cb54f45dac698ead95ecef6
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-08-31 06:20:45 +00:00
Eike Ziller
c79d4bd606 MCU: Use qtcEnvironmentVariable* instead of qEnvironmentVariable*
And instead of qgetenv.
Takes Qt Creator's setting at "Environment > System > Environment" into
account, which makes it easier on some platforms to set them (e.g.
macOS), can be configured differently in different settings paths, and
potentially can be changed at runtime (depending on usage).

Change-Id: Ib644dd6178bf9e0a1a75a2c6cf49fd5f3d121cf4
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Piotr Mućko <piotr.mucko@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-08-31 06:19:45 +00:00
Sona Kurazyan
60a045299d Prepare for moving qVersion() from qglobal.h to qlibraryinfo.h
Include qlibraryinfo.h where it's used.

Change-Id: I31afbca9c69e39eb05175704487ade1e8ae42eee
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2022-08-30 13:56:41 +00:00
hjk
de57a63609 QmlDesigner: Compile fix with current Qt dev
Change-Id: I36fc5871193b600ed4576b14dd1aa141140f30d0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-08-30 12:36:55 +00:00
hjk
7b40f1ed7e Debugger: Fix compilation with current Qt dev
data/dev/qt-6/qtbase/src/corelib/kernel/qmetatype.h: In instantiation of ‘constexpr bool QtPrivate::checkTypeIsSuitableForMetaType() [with X = Debugger::Internal::StartApplicationParameters]’:
/data/dev/creator-out/src/plugins/debugger/debuggerdialogs.cpp:102:1:   required from here
/data/dev/qt-6/qtbase/src/corelib/kernel/qmetatype.h:1162:51: error: static assertion failed: Meta Types must be fully defined
 1162 |         static_assert(is_complete<T, void>::value || std::is_void_v<T>,
      |                                             ~~~~~~^~~~~~~~~~~~~~~~~~~~
/data/dev/qt-6/qtbase/src/corelib/kernel/qmetatype.h:1162:51: note: ‘(((bool)std::integral_constant<bool, false>::value) || ((bool)std::is_void_v<Debugger::Internal::StartApplicationParameters>))’ evaluates to false

Change-Id: Ibbb2c306b7a4c741e05a3e83a140e2053bfeabd0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-08-30 12:36:52 +00:00
Christian Stenger
27c8e2a638 Squish: Redo running test cases
Start allowing interactions with the AUT which enables
interrupting and debugging the test cases.
Use a debugger perspective for interaction and provide
a control bar which is visible while running test cases.

Change-Id: I2c9fde51263516c38e814c91241d3ed3489ecacb
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-08-30 11:47:41 +00:00
Eike Ziller
f8b430c0b2 Various: Use qtcEnvironmentVariable* instead of qEnvironmentVariable*
And instead of qgetenv.
Takes Qt Creator's setting at "Environment > System > Environment" into
account, which makes it easier on some platforms to set them (e.g.
macOS), can be configured differently in different settings paths, and
potentially can be changed at runtime (depending on usage).

Change-Id: I724eecc040e33e249a88243f27e8a9e72e54f24b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-08-30 11:47:05 +00:00
hjk
38235ff6fc QmlEditorWidgets: Remove use of QT_MODULE
Doesn't compile anymore after 8446655f24 in Qt base.

Change-Id: I2609bab06fc88a918b9256c676d783ce04ef7b4f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
2022-08-30 11:46:53 +00:00
Eike Ziller
9d026df988 Boot2Qt: Use qtcEnvironmentVariable* instead of qEnvironmentVariable*
And instead of qgetenv.
Takes Qt Creator's setting at "Environment > System > Environment" into
account, which makes it easier on some platforms to set them (e.g.
macOS), can be configured differently in different settings paths, and
potentially can be changed at runtime (depending on usage).

Change-Id: I4b19d12cb45e3866131189781c824ab017373566
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2022-08-30 11:46:53 +00:00
hjk
373032925d Utils: Use 'hr' for horizontal rule in layouts
More HTML-ish.

Change-Id: I45d2e474b2810f00422a03603aac125c6f845b81
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-08-30 11:21:23 +00:00
Alessandro Portale
bbbc90ee1d Designer: Remove further dead code from newclasswidget.*
The feature with base classes and class types was disabled by hiding the
respective ui fields. Also, the code to handle these features is very
incomplete.
This change removes these ui fileds and unused code remnands.

Change-Id: I27c3288e4937f0d605da85b2f33aba640dcf7371
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-08-30 11:16:47 +00:00
Mats Honkamaa
422a20864e Doc: Update view names in documentation
Changing the following view names:
Form Editor -> 2D
3D Editor -> 3D
Connection View -> Connections
Curve Editor -> Curves
Transition Editor - Transitions

Task-number: QDS-7316
Change-Id: Id9b719b368cf5f7156319a597e94f0a3eb7c89ab
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-08-30 09:02:08 +00:00
David Schulz
e3408a8a0a Editor: fix importing color schemes
Change-Id: I286de6030462e692a673a61f3630ad3ca7f95a2d
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-08-30 06:59:35 +00:00
Alessandro Portale
912b016ab0 Utils: Add "Layouting::HorizontalRule" LayoutItem
We have many horizontal separator lines in the UI, which are each time
repetitively created from a QFrame with some flags set. With the .ui
inlining, we will have more of these separators coming.

This change intoduces a Layouting::HorizontalRule LayoutItem and
replaces various existing QFarme separators with it.

Change-Id: I60bad89e2a2b777fbd2f9d0cf872af81e41dcfd7
Reviewed-by: hjk <hjk@qt.io>
2022-08-29 15:30:25 +00:00
hjk
4348960489 Autotest: Save a lookup in quicktestparser.cpp
Change-Id: Id240d1dec133fd39e1d3fd5202b2087d84783406
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-08-29 14:59:53 +00:00
Tim Jenssen
0d4dce4d7e qds: add QString licenseeEmail()
Change-Id: I3bf43e776358cd0a72b4761ce290addc2b832f60
Reviewed-by: Tuomo Pelkonen <tuomo.pelkonen@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-08-29 14:58:18 +00:00
Christian Kandeler
7f7e54afb7 Restore perfparser submodule state
Was accidentially set to some ancient state in
a7956df3ca.

Change-Id: I987d45f459fffe6659eca960630c5c11b75ec609
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-08-29 14:01:40 +00:00
Piotr Mućko
3b07669850 McuSupport: Convert variables in JSON to qtcreator format
Change-Id: Iaa5abaf024495e14caded27400e1c2933e46854e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Dawid Śliwa <dawid.sliwa@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-08-29 13:44:07 +00:00
Eike Ziller
904c368858 Projects: Use qtcEnvironmentVariable* instead of qEnvironmentVariable*
And instead of qgetenv.
Takes Qt Creator's setting at "Environment > System > Environment" into
account, which makes it easier on some platforms to set them (e.g.
macOS), can be configured differently in different settings paths, and
potentially can be changed at runtime (depending on usage).

Change-Id: I2217f13336ec816d28bd447ccd14a405bff2a3a7
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-08-29 13:39:16 +00:00
Alessandro Portale
c0f2fb9981 ProjectExplorer: inline projectexplorersettingspage.ui
Change-Id: Ia279c32a26f6e07d41fdff71b2f6c2b09075ac87
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-08-29 13:20:21 +00:00
Alessandro Portale
a531a8c64e ProjectExplorer: inline devicesettingswidget.ui
Change-Id: I806fc291e0096c2dadb5489be32cde8f87b1e41b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-08-29 12:22:52 +00:00
Piotr Mućko
d76ba33381 McuSupport: unittests for legacy 3rd party package creation
Change-Id: I83e3daf1f718066b20798aae2cf19836529b1f56
Reviewed-by: Dawid Śliwa <dawid.sliwa@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-08-29 11:50:50 +00:00
Alessandro Portale
cd08759fb6 ProjectExplorer: inline devicetestdialog.ui
Change-Id: I55ff1c6bc5f870268b8fd092a2e4472da49894c7
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-08-29 11:11:53 +00:00
Alessandro Portale
ce97bee8f6 ProjectExplorer: inline devicefactoryselectiondialog.ui
Change-Id: Ia89fe74552236ec6400e9dd08624279f55800945
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-08-29 11:11:44 +00:00
Christian Kandeler
607900ae17 ClangCodeModel: Fix tests
Amends a7956df3ca.

Change-Id: I7cbbd391ee015c5481e90ebdad356d9c6e916d5e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-08-29 11:10:28 +00:00
Piotr Mućko
d66b791df1 McuSupport: Use MacroExpander for variables evaluation
Change format of variables to qtcreator's internal:
From $Qul_DIR to %{Env:Qul_DIR}.

Change-Id: I3838593b979a0a9b7d85e77114b1b129e1a128da
Reviewed-by: Dawid Śliwa <dawid.sliwa@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-08-29 10:46:59 +00:00
Mahmoud Badri
4e5673850c QmlDesigner: Allow adding imported 3D models using the context menu
Also some changes to support translation and avoid translation-related
issues.

Change-Id: Ie2cc491cf491ac4c14e12e8cf666d4b452b9e7c1
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-08-29 09:32:56 +00:00
Christian Stenger
dd2d05a772 Scripts: Fix permissions
Broke with a7956df3ca.

Change-Id: I072ea34183aedf2fd693af1bb589660aa06b9e1c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-08-29 09:32:13 +00:00
David Schulz
49c29fedba Utils: do not escape '\' in assert backtrace output on windows
Change-Id: Ib01a29f572b79f3cc323ab69b70a63408aa46af8
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-08-29 09:31:21 +00:00
Eike Ziller
55c627efef Android: Use qtcEnvironmentVariable* instead of qEnvironmentVariable*
And instead of qgetenv.
Takes Qt Creator's setting at "Environment > System > Environment" into
account, which makes it easier on some platforms to set them (e.g.
macOS), can be configured differently in different settings paths, and
potentially can be changed at runtime (depending on usage).

Change-Id: I159fb6928954240af742708efbd6776104c4631b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-08-29 09:12:37 +00:00
Eike Ziller
57745407de Clang/C++: Use qtcEnvironmentVariable* instead of qEnvironmentVariable*
And instead of qgetenv.
Takes Qt Creator's setting at "Environment > System > Environment" into
account, which makes it easier on some platforms to set them (e.g.
macOS), can be configured differently in different settings paths, and
potentially can be changed at runtime (depending on usage).

Change-Id: I7678b8e429b5eff79f87eb637f6f2131be43d904
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-08-29 09:12:20 +00:00
Eike Ziller
fe4e74af75 Adapt attributions to removal of Utils::variant implementation
Amends 84c1d6572b

Change-Id: I6cf02d577babb35537338447e4918776bd3012fd
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2022-08-29 08:21:05 +00:00
Alessandro Portale
15e0f37b78 Docker: Avoid extra margin around DockerDeviceWidget
Change-Id: I0235e3d3017142638387a8bc5976d51f9713cc32
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-08-29 06:17:47 +00:00
Christian Stenger
c37e5b9152 QmlDesigner: Fix Qbs build
Amends 35a773b2dc.

Change-Id: I684be86dfff78f2c284612975c5147f8af870c8d
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-08-29 05:57:08 +00:00
David Schulz
6b6358178e Utils: print assert backtrace on windows
Change-Id: Ifd9753b22641547c16fb6843dc7a3cf5f5b7c86e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-08-29 05:41:36 +00:00
Orgad Shaneh
72e7130f12 Revert Qbs submodule to 1.23 branch
It was set to a very old commit by mistake in SPDX license change
a7956df3ca.

Change-Id: Ie4aef5cb4fadb321ec7a54a8c1ee24e3eddf0089
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-08-28 07:35:48 +00:00
Alessandro Portale
e070d826e5 ProjectExplorer: inline projectwizardpage.ui
Change-Id: I0c016e08c77b2029a1d024664dde6ae9e3187b3c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-08-26 20:24:40 +00:00
Tasuku Suzuki
95edda95b4 Set ElideMiddle for the editor combobox
When Qt Creator opens more than one file with same name,
the path to be shown tend to long.
In this case last part (file name) is as important as first part.

paths in Locator and Open Document are elided in the middle of path
already.

Change-Id: I953a8068b50331f9ef20ad9efbd947b4dbcf0845
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-08-26 17:33:21 +00:00
Marco Bubke
da36459759 QmlDesigner: Refactor isSubClass
IsSubClass is renamed to isBasedOn and takes now NodeMetaInfo as a
parameter. But for most cases there are is... functions as short cut.
The model is providing shortcut NodeMetaInfos too. This is done in the
sake of caching.

Task-number: QDS-7445
Change-Id: Iff2dea66e253b412105427134bd49cb16ed76193
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>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-08-26 15:02:24 +00:00
Alessandro Portale
fa033876e6 QbsProjectManager: inline customqbspropertiesdialog.ui
Change-Id: I752c101dcdd1ee47880b43ffe61597bbdf67521f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-08-26 14:52:13 +00:00
Alessandro Portale
706a2af1e1 QbsProjectManager: inline qbsprofilessettingswidget.ui
Change-Id: I4e7d1663bac7d21d17092a3510165d6aaf093eed
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-08-26 14:43:55 +00:00