Commit Graph

62421 Commits

Author SHA1 Message Date
Alessandro Portale
454e0bca25 QmlJSTools: inline .ui files
qmljscodestylesettingswidget.ui
qmljscodestylesettingspage.ui

Change-Id: I6d688e9e9b7cbefb552ef015f87d7a3cba21d699
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-09-02 10:04:44 +00:00
The Qt Project
b982868f98 Merge "Merge remote-tracking branch 'origin/8.0'" 2022-09-02 09:41:30 +00:00
Björn Schäpers
a1bfcbf30d ClangFormat: Fix compilation with LLVM 15
Change-Id: I7990e8331c317d3bc363be610b2585d37dee4445
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-09-02 09:40:41 +00:00
Orgad Shaneh
4a86d8ca5c GccParser: Fix typo in test name
Change-Id: I4f2f651356501ff23305efbb26aee232da7d153e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-09-02 09:03:24 +00:00
Orgad Shaneh
7f5c471b0a GccParser: Remove stray escape in regex
Change-Id: Id8ef3e0e85e71d46809297248e6592227866f7cc
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-09-02 09:02:06 +00:00
hjk
ea1b35584d RemoteLinux: Streamline RsyncDeployStep interface
Change-Id: I5b5945758d4d188887e8724c09272f0fd9867c60
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-02 08:50:26 +00:00
hjk
56a8c59845 Utils: Make OsType addition less visible
Change-Id: I092930ef6b0ed6876e32ed6b0c78d6bd58becddc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-02 08:25:27 +00:00
Alessandro Portale
3e8f6bbf82 QmlJSEditor: inline .ui files
qmljscomponentnamedialog.ui
qmljseditingsettingspage.ui

Change-Id: I3d0410c22c4c08e58fe92cae16d1daf465b3facd
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-09-02 08:17:22 +00:00
Eike Ziller
9c708b79ce Merge remote-tracking branch 'origin/8.0'
Conflicts:
	src/plugins/remotelinux/killappstep.cpp

Change-Id: I4360e7d0f2c2ac258613933de81e8a9c40387379
2022-09-02 10:12:40 +02:00
Marcus Tillmanns
b7398f7e0e Update qlitehtml to latest master
Change-Id: Ifff3562560fee9ad31c100be33bf68291c9d402a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-02 07:45:36 +00:00
David Schulz
82cb981dff Editor: improve indent marker painting
Slightly move the indent marker and paint also the the first level.

Change-Id: I8a80b8f694950e3240e69807de71a626a4adc16d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-09-02 06:00:59 +00:00
David Schulz
aebe8da072 Editor: paint indent marker for blocks containing only spaces
Results in a cleaner look since the indent marker are not interrupted on
lines that are for code formatting reasons empty.

Change-Id: I887071715e0224210684d131a93b3799f8504501
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-02 06:00:40 +00:00
Jarek Kobus
6f3c03f1f9 GitClient: Replace for-each-ref command with QtcProcess
There is no need to use VcsCommand when NoOutput is passed.
Get rid of asyncForEachRefCmd().

Change-Id: I91b2226c365c7ce374eccc4884aba7aab5158cb2
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-09-01 16:35:51 +00:00
Jarek Kobus
66bfdffe0c GitClient: Replace describe command with QtcProcess
There is no need to use VcsCommand when NoOutput is passed.
Get rid of execBgCommand().

Change-Id: I58354e99ddc0c4049325560022ba6e755092b817
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-09-01 16:35:41 +00:00
Jarek Kobus
6f50040e13 VcsCommand: Extract some methods for further usage
Change-Id: I385a02d773527a73bbd7fff0a40a40db476a70b8
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-09-01 16:31:17 +00:00
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
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