Commit Graph

76686 Commits

Author SHA1 Message Date
Jarek Kobus
4e74e2aa03 GitClient: Replace rev-list command with QtcProcess
There is no need to use VcsCommand when NoOutput is passed.
Get rid of asyncUpstreamStatus().

Change-Id: Iae6869be9640c7662545906d28314ac47cd69e3d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-01 15:55:41 +00:00
Jarek Kobus
28fdeefe6f VcsCommand: Move some methods into VcsCommandPrivate
Change-Id: I49302dadcc1ceaa7c73970aff9e41237d554098a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-09-01 15:16:07 +00:00
Christian Stenger
c98c4319e9 Libs: Fix Qbs build
Amends a621aa1d8b.

Change-Id: If5276e5558bf8139286c2084400eac915253c7f7
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-09-01 13:46:58 +00:00
Christian Stenger
b417154cac Squish: Rename function
Better reflects what it does and avoids being used for
creation of other test tree items.

Change-Id: I48e26c2f76cd1d80b22fb435a34a3fab6f036db2
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-09-01 13:33:35 +00:00
Marcus Tillmanns
bf9bfeaa9a Debugger: Warn about QML Debug Mode not being enabled
Previously we only warned the user that he has to enable qml debugging
in both run & build config for desktop runs.

With this change we now also warn for other types of devices
( e.g. iOS / Android / Remote debugging )

Change-Id: I1437edc9841668299703dad980a292178c891cfe
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2022-09-01 13:31:07 +00:00
Marcus Tillmanns
d4e385de06 Deviceshell: Base64 not found fallback
If no base64 is installed on the target, the shell script
cannot work. Previously this would lead to the shell functions
being unavailable.

This change adds a fallback path. In case no base64 is found,
the shell will create a process for each run request instead.

This is much slower than the shell script, but acceptable as
a fallback.

Change-Id: I70591d7e610c4e1c3c258a8e4bef354221d05cb9
Reviewed-by: hjk <hjk@qt.io>
2022-09-01 13:30:46 +00:00
Eike Ziller
e77c90469b Utils: 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: I50e457bab2d3495e5c69676fe1a0257a5fea3e52
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
2022-09-01 13:03:05 +00:00
Christian Stenger
7801fda463 ScxmlEditor: Fix missing include
Amends 94d7e2efac.

Change-Id: I8220dbbd0cd30c7a0b2ca851b9486b7915a55a99
Reviewed-by: hjk <hjk@qt.io>
2022-09-01 12:22:46 +00:00
Piotr Mućko
9552658b2b McuSupport: Use qtc Utils::Environment helpers instead of qt globals
Change-Id: I7e50c7a2417dd6cf2abf6f46a67bbc7eed6f664d
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-09-01 11:58:21 +00:00
hjk
a621aa1d8b Libs: Add *tr.h file
Change-Id: I827d3bc1fd24cf2e3fb6dbe9d255f12cc91cd409
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-09-01 11:37:30 +00:00
hjk
69f55ea991 CppEditor: Avoid warning on integer comparison
warning: comparison of integer expressions of different signedness: ‘int’ and ‘const unsigned int’ [-Wsign-compare]
  162 |     if (m_model->editorRevision() != revision) {
      |         ~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~

Change-Id: I1e69f71d3033181ffa0a5ebfb162f3a81ad4938c
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-09-01 11:33:03 +00:00
Alessandro Portale
313226735a Aggregation: Remove translatability of strings in example
Aggregation does otherwise not translate strings.

Change-Id: I3d2a800087609251310c242aef31a58ad17b97a0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-09-01 11:30:34 +00:00
Piotr Mućko
c060e2e5c8 McuSupport: Add missing PackageDescription members initialization in tests
Change-Id: Iee9dce4833c5f9ccf8521952c82b215e17d1a72a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-09-01 10:13:18 +00:00
Piotr Mućko
a0958ee26f Utils: Read env variable using qtc function in MacroExpander
Change-Id: I2570a526d8b0b8a115b3e06a2d672f7b70d2d970
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-09-01 09:44:01 +00:00
Marcus Tillmanns
b17cf5f117 Plugins: Fix nullptr access
Some plugins access their private "d" member in their destructor.
If Plugin initialization failed, these might not have been created.

This would lead to a crash.

Change-Id: Ifd916daf90ebac9a8933dd5489ec1ac0a38254a0
Reviewed-by: hjk <hjk@qt.io>
2022-09-01 08:19:25 +00:00
Alessandro Portale
dc3eae230f ScxmlEditor: Convert to using Tr::tr
Change-Id: Ia8ab06d4b8a16bb144d6887624c478fb911f29ea
Reviewed-by: hjk <hjk@qt.io>
2022-09-01 08:17:40 +00:00
Alessandro Portale
94d7e2efac ScxmlEditor: inline .ui files
colorpicker.ui
colorsettings.ui
colorthemedialog.ui
magnifier.ui
navigatorslider.ui
search.ui
shapestoolbox.ui
stateview.ui
statistics.ui
statisticsdialog.ui

Change-Id: Idab9db2102d4d9dbafb60d2025386165c536d894
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
2022-09-01 08:17:29 +00:00
hjk
7cfc3d26bc Utils: Replace FilePath part setters
... by a combined version. This will make it easier to store the parts
in one QString object.

Change-Id: Ie85a77e3957c78a30e49998fe2e617af35a8ad17
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-01 07:59:29 +00:00
Orgad Shaneh
7a3f95a144 ProjectExplorer: Add missing member in Task::clear()
Change-Id: Iab8ca5fa67406eb05f256fbfcd7e1ded4fdf1a73
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-09-01 07:24:02 +00:00
hjk
e4bc08fb21 RemoteLinux: Fix KillAppStep
Was taking .toString() instead of .path() of the executable FilePath.

Fixes: QTCREATORBUG-28124
Change-Id: I6286585393593cf97cbb2aeb5dbdd7c48bc95dbc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-01 06:58:44 +00:00
Eike Ziller
04e50438eb Utils: Remove Utils::optional
Since we are now requiring macOS 10.14 we can remove our local
implementation of optional and use std::optional for macOS too.

Change-Id: I2bd018261b68da64f7f031a812045dd7784697e1
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2022-09-01 06:58:04 +00:00
David Schulz
34a9491a08 Editor: introduce new editor color scheme
Change-Id: I3b89db321f2a3d7ea355085e07d032b8aaf4023a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-09-01 06:22:45 +00:00
Marcus Tillmanns
1af0eb3504 FilePath: Fix setFromString for short urls
FilePath::setFromString failed previously for URLs
without a path, e.g. "http://qt.io" as it would add
the scheme and host to its path.

Also added a test for various URLs

Change-Id: I6c22489c0af7154734390aa1e5e12693864210b1
Reviewed-by: hjk <hjk@qt.io>
2022-09-01 06:19:01 +00:00
hjk
e9d6c0f154 RemoteLinux: Streamline RsyncDeployStep interface
Change-Id: I5aa5ff477d1c654fd502575c32af667e436a2129
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-08-31 16:41:06 +00:00
hjk
0df4d22d35 RemoteLinux: Rework TarPackage related build steps
Change-Id: I13c27e89186ab5451e1f11cf3cf28cfd9ed10a9d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-08-31 16:40:58 +00:00
Eike Ziller
934bc75cee macOS: Fix description where to change reload settings
in the dialog that asks you what to do when a file changed on disk.

Fixes: QTCREATORBUG-27809
Change-Id: I47b3a7287c725c8f4d37564c1b6a9788665e345e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-08-31 12:04:09 +00:00
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