Commit Graph

75521 Commits

Author SHA1 Message Date
Christian Stenger
82922c8ea8 Squish: Fix wrong ui string
Change-Id: I79f17ecf7110d1da819358d9e7a7f09a3fe836a3
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-09-05 06:27:28 +00:00
Christian Stenger
61f1a40f4e Squish: Fix querying server
Broke with switching the stdout handling from handling it
directly to using a callback in 27c8e2a638.

Change-Id: I69a9058b92807b0a4083b242eb7e4e982baa9096
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-09-05 06:27:21 +00:00
Jarek Kobus
5047802f0a VcsCommand: Remove one runCommand() overload
Not used anymore after changing implementation of execute().

Change-Id: I0af0e61b3bd9184f30f11cd80d377d25acf805f8
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-09-05 06:11:41 +00:00
Jarek Kobus
d26dd8d641 MercurialPlugin: Reuse vcsSynchronousExec()
Passing ForceCLocale sets the LANGUAGE env var to C.

Change-Id: I7317aeeeb95bfbc5e3fa5fb97fb4f243daaa1f7e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-05 06:11:21 +00:00
Henning Gruendl
824ff8f9ca QmlDesigner: Fix icon font distributeOriginNone
Change-Id: I3ff513b78876de325f139393e8902ceed8286107
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-09-03 12:29:07 +00:00
Henning Gruendl
7bbfbb8a7c QmlDesigner: Remove old QtQuick version check
Change-Id: I17710660fd7f362c8255a42516115a36e355798f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-09-03 12:28:56 +00:00
Henning Gruendl
f58ec15bc1 QmlDesigner: Add reset action in workspace menu
Change-Id: I497cff18c7241945c9159f01f88d26eeabe14f4a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-03 12:28:42 +00:00
Jarek Kobus
498fe53116 CvsPlugin: Reuse vcsSynchronousExec()
Change-Id: I8d30310d565c2f345ab98542c936a704108f21e2
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-09-02 15:50:24 +00:00
Eike Ziller
b206eb211f QmlDesigner: Fix qtquickdesigner/isoiconbrowser build
Add projectstorageids.h to the dev package, because it is now needed.
Amends 35a773b2dc

In file included from <build>/qtc_build/include/qtcreator/src/plugins/
qmldesigner/designercore/projectstorage/projectstoragetypes.h:6,
                 from <build>/qtc_build/include/qtcreator/src/plugins/
qmldesigner/designercore/include/propertymetainfo.h:9,
                 from <build>/qtc_build/include/qtcreator/src/plugins/
qmldesigner/designercore/include/nodemetainfo.h:7,
                 from <build>/qtquickdesigner/plugins/qmldesigner/
isoiconbrowserplugin/isoiconbrowseraction.cpp:40:
<build>/qtc_build/include/qtcreator/src/plugins/qmldesigner/
designercore/projectstorage/filestatus.h:6:10: fatal error:
projectstorageids.h: No such file or directory

Change-Id: I257c296c8db045c024dbbc516e43fc4b031e0c05
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-09-02 15:13:16 +00:00
Eike Ziller
4c83ec2372 macOS: Do not partially switch light/dark when system switches
If during the runtime of Qt Creator macOS switches the system theme
between "dark" and "light", Qt Creator should not partially switch its
appearance. Since Qt Creator does not support switching the theme at
runtime, it must stay fixed on the appearance of the selected theme.

The code previously only forced Qt Creator's macOS appearance if there
was a mismatch on startup. So if you started a light (or default) Qt
Creator theme while the system was in light mode, Qt Creator's macOS
appearance stayed at the "default for the system", and if the system was
changed to dark mode, Qt Creator would follow that partially in the
styling of standard controls only.

Instead always force Qt Creator's macOS appearance.

Fixes: QTCREATORBUG-28066
Change-Id: I0eb8fcbc6cf9d2b3e548dd871b9a3e1e611c136a
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-09-02 13:50:55 +00:00
Jarek Kobus
6d6346044c VcsBase: Rename vcsFullySynchronousExec into vcsSynchronousExec
Get rid of original vcsSynchronousExec(), as it was calling
vcsFullySynchronousExec().

Change-Id: I911dc786d54c34c211d03661c37df9b58d60a20b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-09-02 13:46:12 +00:00
Jarek Kobus
996e1bfc45 VcsBase: Reuse vcsFullySynchronousExec() in vcsSynchronousExec()
Both implementations look the same nowadays.

Change-Id: I00503f625395db3354eefa8d55326ee22f452c2e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-09-02 13:46:02 +00:00
Jarek Kobus
2a2b136624 VcsCommand: Get rid of abort()
Use destructor of VcsCommand instead.

Change-Id: Ie914d016c6d3d57a88674ce8534d5edec4bc79c1
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-02 13:22:15 +00:00
Jarek Kobus
84426350d4 VcsCommand: Fix unblocking GlobalFileChangeBlocker on abort
Change-Id: Ied60a0ecb291e50f4c48dc2e5df3371e4010932e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-02 13:22:10 +00:00
Jarek Kobus
3dc3870475 VcsCommand: Don't run in separate thread
Change-Id: Ief0e859d3ce48f804e128cc0f5cb1b390a066923
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-02 13:21:57 +00:00
hjk
210c60a401 Debugger: Allow selecting "None" as debugger
The possibility went accidentally away with c04f3a94ea.

Change-Id: I5b2d0ddf89f0aad67a864de172165abe1e13cf4f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-09-02 11:33:20 +00:00
Björn Schäpers
5aa8c55f14 Fix build with MinGW
I honestly can't tell why this is now needed, it seems to be related to
an update in the MinGW headers since I couldn't build previous versions
of the creator anymore too.

This pattern is already often used.

Change-Id: I81adfa2dc8fb4606b0b47a4ade5d1f5db054df9a
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2022-09-02 10:43:45 +00:00
Aaron Barany
8276bd265b LanguageClient: Adjust restart limits
Changed restart timer to 2 minutes and max restarts to 5 for restarting
language client after it exits unexpectedly. This avoids disabling the
language client with clangd 14 in situations where it's likely to crash
during normal editing.

Change-Id: I333bb9d67ed1dbba2b52a1cd916f5d1cf3c0b60b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-09-02 10:09:48 +00:00
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
David Schulz
9ee75225f0 Editor: reduce brightness of visual whitespace in dark schemes
Change-Id: I1e2bf91aec09b4762be3b613ddb7a402edd7da8d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-09-02 08:43:42 +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
Alessandro Portale
024c327993 scripts: Add scrubts.py for .ts file cleanup
Rewrites a .ts file, removing duplicate messages of a specified
translation context and joining adjacent occurrences of that context.
Unlike lrelease and lconvert, this script does an exact comparison of
the whole <message/> xml tag.

Use on all .ts files:
 for tsfile in share/qtcreator/translations/qtcreator_*.ts; do python
scripts/scrubts.py $tsfile -context FooBar; done

Change-Id: I2dea5a0b00e35031718e654b289d6ad39dbaac2a
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2022-09-02 07:23:46 +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