Commit Graph

80529 Commits

Author SHA1 Message Date
Robert Löhning
82b5cc89cb SquishTests: Log used Python version
Change-Id: I60cb928382840f34800af6a8ee1ed7f084acfb93
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-05-08 07:33:12 +00:00
The Qt Project
a65637be5c Merge "Merge remote-tracking branch 'origin/10.0' into temp" 2023-05-08 07:30:02 +00:00
Orgad Shaneh
a11800ca16 Doc: Update shortcut descriptions
Follow-up commit 27966a17499a23f2d681f4318787eb49c938d6b1.

Task-number: QTCREATORBUG-10170
Change-Id: Ifbb370ee6500e0cfdc63772c05bf33cae4b957c9
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2023-05-08 07:29:51 +00:00
Eike Ziller
5917171911 Merge remote-tracking branch 'origin/10.0' into temp
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs

Change-Id: I877666cf9c209c5b0a1365aeb81d9cb13144a993
2023-05-08 09:17:56 +02:00
hjk
cc45afdfb0 Layouting: Avoid a lambda in the demo
Change-Id: Ic11936fd2a6da2153a52e39249d49d174ffb8466
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-05-08 06:58:17 +00:00
Eike Ziller
e4f4ad8aa6 Bump version to 10.0.2
Change-Id: I8722d122d18e78054d844a4f4e75cf7d2ef746ef
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-05-08 06:49:53 +00:00
Jarek Kobus
c879aeb565 SearchResultItem: Introduce SearchResultItems
And reuse it.

Change-Id: Ia052297340f2bf2478fbfdb2427b45e30bd9d067
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-05-08 06:41:41 +00:00
Jarek Kobus
8b3aa900da Utils: Move SearchResultItem/Color into Utils
It's going to be reused inside FileSearch.

Change-Id: I8993d7158ff31c311c2283d32bc43465a8946a52
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-05-08 06:41:27 +00:00
Orgad Shaneh
2c61eac1cb Git: Change default shortcuts for "Current Project" to Repository
Current Project is misleading. Current Repository refers to the
repository of the current file, which is much more expected for
"everything around" actions (Diff, Log).

Task-number: QTCREATORBUG-10170
Change-Id: I252f40cd3dfd9de184a889355b59f91bb64983dd
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-05-08 06:29:59 +00:00
Marcus Tillmanns
6aa02fe804 Utils: Combine startStubProcess parameters
Change-Id: Ic0515a3864687494bd1e280a82b91a5bafef46b1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-05-08 06:24:00 +00:00
Jarek Kobus
ca1e0dae56 Utils: Introduce QTC_SCOPED_TIMER()
QTC_SCOPED_TIMER() is a handly debug tool that measures
the time spent in a block of code. It starts measuring the time
when the line where it was placed is reached, and stops measuring
the time when the current invocation exits the block in which it
was placed (i.e. when QTC_SCOPED_TIMER() goes out of scope).

The QTC_SCOPED_TIMER does two printouts:
1. When it starts - it prints the current time, filename and
   line number.
2. When it ends - it prints the current time, filename,
   line number and the timeout in ms.

The QTC_SCOPED_TIMER() was added into qtcassert.h file on
purpose, as this file is included already in most of the
codebase. In this way, when it needs to be used, it's enough
to add a QTC_SCOPED_TIMER() without adding extra #include.

Example use case, after adding the "QTC_SCOPED_TIMER()" into
ProjectExplorerPlugin::initialize() as a first line:
SCOPED TIMER [14:46:57.959] in [_long_path_here_]/
projectexplorer.cpp:823 started
SCOPED TIMER [14:46:58.087] in [_long_path_here_]/
projectexplorer.cpp:823 stopped with timeout: 127ms

Change-Id: Iaed3f297c8aeb6e90dd9909e76fc9933599a39b6
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-05-05 18:14:22 +00:00
Alessandro Portale
1e1befd9eb Proliferate pathListSeparator()
Change-Id: I546107af6a88ad5901659a0a64485e4ebca3a164
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2023-05-05 15:17:10 +00:00
Alessandro Portale
fe45294357 Wizards: Remove build system step from Qt Quick Application wizard
Qbs is now covered by the "compat" wizard

This reverts commit 13cf1ee948.

Change-Id: Ic11a6bd4847d08b60f77421ecbc168bc46c50c6a
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-05-05 15:16:26 +00:00
hjk
62f3d29be4 Layouting: Introduce Ids for Items
Intenally just wrapping a 'bindTo' result, but less trigger potential
for pointer related peladophobia

Change-Id: I25171a2675fb0474ce97c04552ac1cf5ffd6ee56
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2023-05-05 15:08:23 +00:00
hjk
7581dcd369 FakeVim: More compact settings page implementation
Change-Id: Iaca48e8a22f26817442dbf5147f318868dbd1f34
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-05-05 14:29:13 +00:00
Jarek Kobus
fb50e35db9 FilePath: Fix hash function
For better performance, include also the scheme and host in qHash
calculation.

Change-Id: I2a69a128597429b88a71943d248ce038b49285f2
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
2023-05-05 13:40:31 +00:00
hjk
d5329d56b6 Layouting: Add demo
Currently almost the same as the comparison example, but planeed to
grow.

Change-Id: Id129266a1b5b12438e2fb643ee114e6d816581f6
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-05-05 13:09:02 +00:00
hjk
652e99830f Layouting: Add some support for spin boxes
Change-Id: I5eff963cf605f5239a96daee924e91b2c170f506
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-05-05 13:08:40 +00:00
hjk
9106a6e662 Nim: Normalize somewhat unusal ctor/dtor split
Change-Id: I65e6fac252c068b11c45d06bcbcbc08c9316a528
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-05-05 13:08:26 +00:00
hjk
2fa375671a Android: Use LayoutBuilder in AndroidDeployQtStep
Change-Id: I855227bffa18aef5d547510a9c447071527ddcba
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-05-05 13:08:17 +00:00
Jarek Kobus
af32b0ce44 Tests: Rename tst_AsyncTask -> tst_Async
Follows 187a7640de

Change-Id: I58e6afbc0cbdea37c405b11e133d794a91f09fc6
Reviewed-by: hjk <hjk@qt.io>
2023-05-05 12:35:56 +00:00
Jarek Kobus
abce79939a Tests: Rename tst_QtcProcess -> tst_Process
Follows 470c95c94b

Change-Id: Ie26b5677d28e645ab27aeebf5976b5507385716a
Reviewed-by: hjk <hjk@qt.io>
2023-05-05 12:35:50 +00:00
hjk
34a3852efc Haskell: Compactify option page implementation a bit
Change-Id: I1aa765e47ae60a4b4e47888bf8f0d5dfd1ec23cc
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-05-05 12:15:54 +00:00
Eike Ziller
302afcdfc7 Markdown: Fix focus handling
When the markdown editor is opened or switched to, the focus is set on
the editor widget. We don't want the focus on the splitter, but on
either the text editor or the preview, depending on what had focus
before.

Change-Id: Ib54899c6251f2c5362f95d990e7150b6fee0f1e1
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-05-05 12:05:42 +00:00
hjk
1c34fc7bca Layouting: Fix advancing by empty cells
Change-Id: I404e80e98a8fa53e174a8a372b82e17e8187a52c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-05-05 11:59:06 +00:00
Alessandro Portale
5943152f65 Android: Remove CheckableMessageBox::shouldAskAgain check
Most likely, that was checked in addition to InfoBar::canInfoBeAdded in
order to be settings compatible with QtC versions prior to the migration
from CheckableMessageBox to InfoBar. But that is at this point 4 Years
ago, and should be removed because it causes confusion when reading the
code.

Change-Id: I76ae6a9ed0c8f9f7fa20b64090d89724588511ed
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-05-05 11:51:40 +00:00
Alessandro Portale
4d2632c3fa Toolbars: various toolbar layout tweaks
This makes sure that toolbutton sizes and spacings are correct in all
toolbar layout modes.

Task-number: QTCREATORBUG-29082
Change-Id: If2aad74b77c0b8dcda81478e3d345c783584cec4
Reviewed-by: hjk <hjk@qt.io>
2023-05-05 11:36:52 +00:00
Alessandro Portale
09a58ddd12 Tracing: Follow the active toolbar style
This makes sure that the toolbar and toolbuttons in the trace resemble
the look of the widget based UI in compact and relaxed toolbar style.

This comes with the restriction that an already open tracing scene does
only adapt to that change after an IDE restart.

Task-number: QTCREATORBUG-29082
Change-Id: I6422227256d8e13658ff5565ae640e15c5e61229
Reviewed-by: hjk <hjk@qt.io>
2023-05-05 11:36:44 +00:00
Alessandro Portale
0430aaeac8 Core: Center the arrows on the OutputPaneManageButton
Calculate the positions, instead of fixed coordinates.

Task-number: QTCREATORBUG-29082
Change-Id: Iaf7ac9598bfd031a62222520be16d24652e2798c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2023-05-05 11:36:32 +00:00
Alessandro Portale
02637390fa ManhattanStyle: Draw round rectangles in "Relaxed toolbar style"
Task-number: QTCREATORBUG-29054
Change-Id: Ic06ddfec87fd9b43c88b3a7dfb9946c3a8b22c60
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2023-05-05 11:36:25 +00:00
Alessandro Portale
495f5f006f Utils: Add toolbarStyle to StyleHelper
Task-number: QTCREATORBUG-29054
Change-Id: I01572eb7bdd267ea6aadb9530afc52b3c7834382
Reviewed-by: hjk <hjk@qt.io>
2023-05-05 11:36:06 +00:00
Alessandro Portale
2e9494bd71 Core: Add "Toolbar Style" ComboBox to General settings
Stores the style as int under General/ToolbarStyle. ManhattanStyle
restores the setting on contruction, just in time before widgets
get "QStyle::polished".

Task-number: QTCREATORBUG-29054
Change-Id: Ifea953261eab0d42e35a128e2f3338fbbef06a88
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2023-05-05 11:35:28 +00:00
hjk
2d8fd4f017 Nim: Remove now-unnecessary function reimplementations
Change-Id: Ie271499cb99766fd48b77ce66f2d42d898a8e115
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-05-05 10:37:39 +00:00
Marcus Tillmanns
845192eb14 Terminal: Fix strings
Change-Id: I573d642084d3cc26e032c43d6fb7c1fdd2594d4d
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2023-05-05 09:36:49 +00:00
Robert Löhning
200d3b455b SquishTests: Don't test.verify state of checkbox in getBuildIssues
- It generates a ridiculously large number of test results in
  comparison to what's actually tested
- In tst_memberoperator, it is used in waitFor(). Thus, it depends
  on timing and the number of test results varies from one
  execution to another

Change-Id: I7d4ad8f87590b4fc2dda51e9eda703961c7acd9e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-05-05 09:35:38 +00:00
Robert Löhning
8d03220017 SquishTests: Improve log messages of exceptions
...and make them more similar to Squish's own "Error" messages.

Change-Id: If5df701d4fa01fc1c1aea94cc9778a6a5dccc44e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-05-05 09:33:01 +00:00
Marcus Tillmanns
f4abb1ec4a Terminal: Remove unnecessary destructor
Calling Aggregate::remove is not necessary and led to a warning message.

Change-Id: I51cdd7bfa9bdda7a3ebedf6a86e48fe54fd8f3ef
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-05-05 09:21:51 +00:00
Marcus Tillmanns
84b2862058 Utils: Improve CheckBox layouting
This is not correct either, but the vast majority of Checkboxes
is not added to Forms, so the !form case is a better fallback.

Change-Id: I1375b3e23138fb6d881b2331ecf1d0f3a4f5431b
Reviewed-by: hjk <hjk@qt.io>
2023-05-05 08:52:20 +00:00
Eike Ziller
7724f8653f Merge remote-tracking branch 'origin/10.0'
Change-Id: I7a3925ad8e4f97461b64a70217102ed900430253
2023-05-05 10:39:47 +02:00
Kai Köhne
15193d3250 Simplify generated CMakeLists.txt
Fixes: QDS-9700
Change-Id: I2376e3938fb6f95d2cc53ad96b40c04ac7ce780e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-05-05 08:35:43 +00:00
hjk
328d4c7295 Layouting: Code cosmetics
Change-Id: I0eea49bc5c39679ca66f73616a98e91546e493c2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-05-05 08:21:34 +00:00
hjk
8b2f9b5d9c Debugger: Option pages code cosmetics
Change-Id: I299b944c95bd803ed143b0c06844ed92f76f856e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-05-05 07:36:48 +00:00
Karim Abdelrahman
b083a4d55e McuSupport: fix toolchain naming difference between windows and linux
Toolchain naming convention is different in windows "mingw" than in
linux "gcc". That caused the logic to fail on windows and prompt the
user to remove a kit of an existing target.

Task-number: QTCREATORBUG-29003
Change-Id: Ib99a9b38fec30b9a6826874f1acd0bb2f8615e1e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Sivert Krøvel <sivert.krovel@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-05-05 06:31:07 +00:00
Cristian Adam
8854f53a42 CMakePM: Fix duplicated CMake presets kits
QTC_KIT_DEFAULT_CONFIG_HASH was introduced in order to match the
previous CMake presets kits.

This would hash the Qt and the C/C++ compiler paths.

Unfortunately on Linux CMake would pick "cc" and "c++" by default,
whilst Qt Creator uses "gcc" and "g++". The compilers would match from
the Qt Creator point of view, but the hash values would be different.

On mac there is a similar issue with compiler launchers.

This patchset fixes this by removing the hash and fixes also the issue
of allowing broken CMake presets kits (without any compilers), which
were the reason for introducing the hash key in the first place.

Fixes: QTCREATORBUG-29075
Change-Id: Id8dc081febba7bc7023c98055afc6ebfcdc55542
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>
2023-05-04 15:19:44 +00:00
Cristian Adam
13dd678834 Utils: Fix MinGW build
Amends a0f6e8dc04

The issue is that pthread.h is including <process.h>, which ends up to
utils/process.h since it's first in path.

Change-Id: I525384083b6952aded4b77c29d00d85f084c60f9
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-05-04 15:13:17 +00:00
Christian Kandeler
34ad405d76 QbsProjectManager: Consider cpp.warningLevel in compiler options setup
Change-Id: I6f955691c1fedf319716e98645de50590fb05747
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-05-04 13:39:21 +00:00
Marcus Tillmanns
ce7bd57926 Core: Fix warning on macOS
Previously the icon was taken from the new file/dir name which does
not yet exists. This lead to a warning message. Settings a fixed icon
fixes this.

Change-Id: I4e7def0dfafd9d62b9a010ff850f3c7ea18c79a2
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-05-04 12:16:48 +00:00
Alessandro Portale
d6e22f4375 Examples: Make GridItemImageSize adapt to GridItemWidth/Height
Reduces the magic values a bit, and adds comments.

Change-Id: I9b288663ccfdaffdc2ffd25260d87c97c5dcbde1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-05-04 11:31:21 +00:00
Christian Stenger
6e2e7a63e6 QmlJS: Allow reset of the customized analyzer
Provide a context menu to reset the enabled and disabled
messages of the static analyzer to the internal default.

Change-Id: I98bde71899ad4de50d0e170bf0d2892b87989ceb
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2023-05-04 11:03:29 +00:00
Christian Stenger
427640063e QmlJS: Allow disabling static analyzer messages
Provide settings to define a customized set of enabled
static analyzer messages.

Fixes: QTCREATORBUG-29095
Change-Id: Id629e383dd9e3beeef98026759ac66716dc43d23
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2023-05-04 10:49:07 +00:00