Commit Graph

85691 Commits

Author SHA1 Message Date
hjk
e65dc8007b CMake: Remove ActionBuilder::setCommandDescription() calls
... where the default implementation via stripAccellerator(action()->text())
would yield the same result.

Change-Id: Ie921863d472e0592a8c97830d67873ccfb1b57da
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-01-08 15:18:18 +00:00
The Qt Project
9ff7ea3980 Merge "Merge remote-tracking branch 'origin/12.0'" 2024-01-08 15:14:50 +00:00
hjk
c56bd22afd Utils: Introduce a FilePath::chopped() convenience function
Change-Id: I5fd813af83d58e62e026b3764d3d4378429c2162
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
2024-01-08 15:07:19 +00:00
Eike Ziller
60d1838220 FancyMainWindow: Remove unused private member
Change-Id: I60b348e0712fc0e4443dc396b1656c31889d4f6b
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2024-01-08 15:03:56 +00:00
Eike Ziller
8e4b5e1109 FancyMainWindow: Restore dock sizes when hiding/showing areas
Since we cannot make multiple dock widgets invivsible and visible at
once, the individual setVisible calls sometimes mess up the relative
dock widget sizes. That seems to also depend on which dock widgets take
part in that process. For example, when putting the Breakpoints view
together with other views into the right dock area in Debug mode, hiding
and showing that area would give the Breakpoints view more size than
before (similar with Threads and Stack views).

Remember the dock widget sizes and explicitly restore them when re-
showing an area.

Change-Id: I3868549ac7362a67f47fcf59b8fc3025befc86d2
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-01-08 15:03:48 +00:00
hjk
8e653c60d6 ProjectExplorer: Don't burn step id into BuildStepFactory::m_creator
This can be re-used in a (augmented) copy of the factory via
BuildStepFactory::cloneStepCreator with the possibility to use
a new step id in the new factory. In that case the new factory
should create steps with the new id.

Change-Id: I661537408e32fdeda9c45bde1abb54d32b9cbac6
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2024-01-08 14:53:11 +00:00
Jarek Kobus
0c4701e45d CompilerExplorer: Avoid using keys()
Instead, iterate directly over the container.

Change-Id: I6a3cb7d623e083663a11389f15b8d51599f338a3
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2024-01-08 14:36:55 +00:00
Christian Stenger
e901167952 Utils: Tweak FilePath device handling
This allows using file scheme in certain contexts.
E.g. starting Qt Creator with

 qtcreator file:///tmp/dummy.txt:10

did not work before while just using the scheme-less
absolute path did.

Task-number: QTCREATORBUG-30143
Change-Id: I8f2b728e733792eb92295bff60b27aecb4b3b8ed
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2024-01-08 14:27:41 +00:00
hjk
58396a5da1 Terminal: Use new ActionBuilder syntax
Change-Id: I1d739ca80f41073a55755816468c47f743838f81
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2024-01-08 14:19:10 +00:00
Eike Ziller
cf63b1884e Merge remote-tracking branch 'origin/12.0'
Conflicts:
	src/libs/utils/treemodel.cpp
	src/libs/utils/treemodel.h

Change-Id: I9c5e8ef77905745c201cfc647218c9e747d268d6
2024-01-08 14:56:54 +01:00
Artem Sokolovskii
f2cb979aa3 ClangFormat: Rename override checkbox
It improves the UX design of CodeStyle page.

Change-Id: I4458896d6787df462de18025d292bdb481d03c89
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-01-08 13:50:38 +00:00
hjk
2c8f15ba6c Core: Use ActionBuilder in ExternalToolManager
Change-Id: Id92e0d8788aabbe9fe7cfb93680835a2c3f55b99
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-01-08 13:36:11 +00:00
Leena Miettinen
4d91473c69 Doc: Create a group for supported platforms in Reference
Task-number: QTCREATORBUG-29361
Change-Id: I11f84b97e482c75c157ccec827f5214a9e8d7a7d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-01-08 13:27:48 +00:00
David Faure
a61f9162f1 Fix TreeModel emitting nested QAbstractItemModel signals
This led to an assert in QSFPM because it got confused by the
nested reset signals.

Detected by adding
new QAbstractItemModelTester(this,
QAbstractItemModelTester::FailureReportingMode::Fatal);
to the OutlineModel constructor, and just opening QtCreator on a small
qmake-based project.

Fixes: QTCREATORBUG-30035
Change-Id: I41dbc81b5a2275521ece6b865115e1428e07ecf7
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
(cherry picked from commit 9124833a63)
Reviewed-by: David Faure <david.faure@kdab.com>
2024-01-08 12:50:17 +00:00
David Schulz
419eae839a TextEditor: improve line column button tooltip
Automatically hide the tooltip of the line column button in the editor
toolbar when the cursor leaves the widget.

Change-Id: Ia17f40029d0821584c8a804b44431a5d7e639066
Reviewed-by: hjk <hjk@qt.io>
2024-01-08 12:37:21 +00:00
Leena Miettinen
ab79d1f970 Doc: Split up "Parsing C++ Files with the Clang Code Model"
Turn "Use compilation databases" into a separate topic.

Task-number: QTCREATORBUG-29361
Change-Id: I022dcd1e0f59293be42b0f953084c63349d5600c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-01-08 12:09:04 +00:00
hjk
e982712ab0 PerfProfiler: Use ActionBuilder to create menu actions
Change-Id: Ice1775567ed15aa577e3ea7fe98ade65508b2486
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-01-08 11:23:32 +00:00
Eike Ziller
9954a285f2 Doc: Fix insource build
When implementing acknowledgments via the generated attributions file,
the complete `<qtc_build>/doc/` directory was added as a source
directory for qdoc. For insource builds the build directory is the same
as the source directory, so qdoc would suddenly include all
documentation from `<qtc_source>/doc/`, which mixes Design Studio and Qt
Creator documentation.

Move the generated attributions file into a subdirectory, and only add
that subdirectory. Also fix that attributions were not generated at all
anymore after trying to fix issues when qdoc is missing.

Amends 2ce9f9d97d and
13b48144a6

Change-Id: I689827dabca37c81d4351dec04f23f46503429f6
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
2024-01-08 11:18:53 +00:00
Christian Stenger
f663f22fa0 ExtensionManager: Minor fixes
* re-order some includes
* avoid using *tr.h inside header
* typo

Change-Id: Iba8d46384410ff06b184f55d66c4e7afca4ab666
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-01-08 11:08:32 +00:00
Jarek Kobus
75e8d4767b Autotest: Avoid using keys()
Instead, iterate directly over the container.

Change-Id: I4a29d1e81f2cbb01f2c06bed4035cf45e51b9dd7
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-01-08 10:53:12 +00:00
David Schulz
4f857711c2 Python: install lsp into tempdir for remote interpreters
Change-Id: I4b0b1a47c73742cc14f68d80b9116fcd51224bd1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-01-08 10:42:48 +00:00
hjk
7a0cae607e Core: Move details of shortcutsettings implementation to .cpp
Change-Id: I2ea2626142ad2e94d30c2dd88ef5a3a1aa06389e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-01-08 10:37:12 +00:00
Mathias Hasselmann
a213ce3875 TextEditor: Repair insertExtraToolBarWidget()
New extra widgets for the right side were wrongly inserted between the
buttons for line-ending text-encoding.

Task-number: QTCREATORBUG-30166
Change-Id: I0f55c44344f9586e6aa97da20f5e25c28adf964c
Reviewed-by: David Schulz <david.schulz@qt.io>
2024-01-08 10:21:13 +00:00
hjk
f869b00163 Core: Use ActionBuilder for Expand/Collapse All in Search window
Change-Id: Iee86231107171cf2e64b3b3b934bc0dfd4390354
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-01-08 10:04:57 +00:00
hjk
fcffb4eba7 Core: Use ActionBuilder for Save All
Change-Id: Id3f288698d74997023d66f587e62b409497d7230
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-01-08 10:04:42 +00:00
Cristian Adam
c28f5eb5c9 GitHub Actions: Use llvm-link for linking
This would improve linking times an all platforms. And since
we use a llvm/clang build we already have llvm-link for all
platforms.

Change-Id: I5b586a79482e7ae656939e8827677e902779e858
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-01-08 08:50:49 +00:00
Jarek Kobus
24649c4980 TaskTree: Add a test for nested cancel
Change-Id: I5d4d329e6c069e744d25d6f94e1d33b53f288f13
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2024-01-08 08:42:00 +00:00
Leena Miettinen
e76ac2e98d Doc: Update instructions for writing Qt Creator and QDS docs
- Mention the new grouping of topics
- Mention that the TOC is now used to automatically generate
  navigation links in the Qt Creator Manual
- Link to QUIP 21 for instructions on using images
  (leave Qt Creator and QDS specific instructions and examples)
- Remove section about Qt Quick Designer docs, which are no longer
  built as part of the Qt Creator Manual
- Remove the example for configuring the docs for an external plugin
  because Fossil is now in qtcreator and Qt Application Manager will
  move there in v.13.0
- Fix broken links to Qt Creator Manual
- Add links to QDoc commands
- Add and remove screenshots
- Fix some language and style issues

Change-Id: I669a3bd5245140f6894bab3fec463766808f1b2a
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-01-08 08:37:08 +00:00
Marcus Tillmanns
a3b9393bc5 Terminal: Do not unlock the locator
Ctrl+K is a useful shortcut for some users, so we have to block the locator if the keyboard is locked.

Fixes: QTCREATORBUG-30032
Change-Id: I211e0bc449d3981513cc77bd14baf70a9acc3ae1
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2024-01-08 08:25:07 +00:00
Marcus Tillmanns
3795a94144 Terminal: Block Close Terminal
Fixes: QTCREATORBUG-30070
Change-Id: Id775bea9f3db851f07f6e86aedb02f975b5a7ee4
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2024-01-08 08:24:53 +00:00
Marcus Tillmanns
690d6a6c8f CMake: Fall back to reading CMakeCache.txt
Allows the user to select cache settings even if configuring failed.

Change-Id: I821c28f386e0c249b4c4d9c6561a377cb48b3f2d
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-01-08 08:24:33 +00:00
Jarek Kobus
16b40c5bb6 TaskTree: Fix stop() method
Reset internal data after a call to stop().
Add a test for restarting the task tree.

Change-Id: Iedf11d97c33c9001c818078abc816e3c483c42b8
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-01-08 08:09:25 +00:00
Jarek Kobus
9f7fe7b5e6 TaskTree: Simplify starting RuntimeContainer
The place for invoking a possible repeater handler
is inside the TaskTreePrivate::startChildren().

Change-Id: Icc678967e695e9d5e0f494110d236b7caaa05c90
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-01-08 08:09:16 +00:00
Jarek Kobus
becd9b9856 TaskTree: Get rid of nextChild arg
Introduce RuntimeContainer::continueIndex() instead.

Change-Id: Iced7a7824addb84ea45bd1d632b4814ac4a95e06
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-01-08 08:09:09 +00:00
Jarek Kobus
91e2437112 TaskTree: Do internal renaming
Change-Id: I2c32156f553bc692d09c4f1b6f6e7bf5a4332f99
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-01-08 08:08:58 +00:00
Christian Stenger
79cde2741b QmlPreview: Fix qbs build
Change-Id: I355ad9ad793cb6aea5493335419f1db858400a01
Reviewed-by: David Schulz <david.schulz@qt.io>
2024-01-08 07:27:24 +00:00
Jarek Kobus
23ed1977da TaskTree: Keep a stack of active storages
Make it possible to run a nested task tree containing
the common storage from the outer task tree's handler.
This means we need to manage the stack of active storages
per thread.

Add a test for it.

This addresses the 4th point in the report below.

Task-number: QTCREATORBUG-29103
Change-Id: Ib0f925048197625a0eb9f83f262c7256a5756cc8
Reviewed-by: hjk <hjk@qt.io>
2024-01-08 07:08:30 +00:00
hjk
81928443ad CPaster: Use ActionBuilder
Change-Id: I20d3e3f9feb1e610038594a1d8d54f2169b2b675
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-01-08 06:19:01 +00:00
hjk
74f523a692 QtSupport: Add some extra hint when qmake seems not usable
Change-Id: Ib7fdd894c9f99c67badcf50683237cf4ce080057
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-01-08 06:18:26 +00:00
Yasser Grimes
f7950acd94 McuSupport: Accept wildcards in detectionPath and executableVersionDetector
In case the g++ symbolic link does not point to any g++ executable it
should be possible to pick other installed g++ versions

Fixes: QTCREATORBUG-29891
Change-Id: I3070e38617a85489e1e6bfb3b1a6368af684829f
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-01-05 16:32:48 +00:00
Leena Miettinen
7aa57249b8 Doc: Describe setting CLICOLOR_FORCE to 0
...to disable the ANSI Escape codes support in CMake.

Task-number: QTCREATORBUG-30147
Change-Id: Icbc5fa26652d85bbd89d827914b2c59051c69ab0
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2024-01-05 15:34:50 +00:00
Tim Jenssen
435761fd0a Merge remote-tracking branch 'origin/qds/dev'
Change-Id: Ieb14c6311dbfe828a94981854b9ec8c18182b6cd
2024-01-05 14:18:18 +00:00
Leena Miettinen
158058ca3b Doc: Reorganize the "Designing UIs" section
- Create how-to and reference topics.
- Move the short descriptions of topics to "IDE Overview".

Task-number: QTCREATORBUG-29361
Change-Id: I11a334de6151350ce993e4135828a3eecaabf308
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
2024-01-05 13:35:43 +00:00
Jarek Kobus
2fca517068 Process test: Fix flakiness on linux / mac (2nd try)
It looks like when the running process outputs the newlines,
reading it may be split into separate chunks.

Avoid newlines in this test and use std::flush instead.

Amends bc3e30e7ec

Change-Id: I46be774b5509a1f0f60b289f6b6ffc9b46955b8f
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-01-05 13:05:51 +00:00
Thomas Hartmann
81421c2c8e QmlDesigner: Do not warn about attached properties
Change-Id: I2a59f5133d1542766bcd82551c998d5cf4d38d56
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-01-05 12:41:53 +00:00
Jarek Kobus
3a9c5a3e7d ManhattanStyle: Remove a hack for QComboBox wheel scrolling
Use Utils::setWheelScrollingWithoutFocusBlocked() explicitly
when a QComboBox is placed inside a scroll area.

The Utils::setWheelScrollingWithoutFocusBlocked() is more
general and may be applied to other widgets, like QSpinBox.

This patch brings back the wheel scrolling without a modifier key
for combo boxes placed in dialogs.

Keep the unconditional scroll wheel behavior when ctrl (meta on mac)
modifier is pressed.

Change-Id: Ieea0f228cea6b59e276bd3256eb6ea5ecc5b7d14
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-01-05 12:09:29 +00:00
Jarek Kobus
b49c40181a GuiUtils: Apply wheel blocker to more widgets
Attach it to configuration and aspect widgets.

Change-Id: Ifd649f6dbf8bbb1ce1cf7251ac46b7cfac9798e3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-01-05 10:17:35 +00:00
Cristian Adam
c48c3110da GitHub Actions: Update macOS runner to version 13
This version comes with 4 CPUs instead of 3.

Change-Id: I0a5de644e668a77a9cbda9fa57b6a322351dafa4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-01-05 10:13:45 +00:00
Cristian Adam
f5fd5f1fd3 CMakePM: Fix Conan iOS/macOS package manager auto-setup
CMAKE_SYSROOT is used by Qt Creator for cross-compiling, and also
selecting toolchain on macOS.

Whilst for iOS CMAKE_OSX_SYSROOT is used for the same task.

Make sure to pass these CMake variables to conan via the generated
toolchain file.

Qt Creator also uses for iOS the Xcode generator, which is a multi-
configuration generator. This patchset will set the "Debug" and "Release"
configurations that usually conan scripts use.

Fixes: QTCREATORBUG-29978
Change-Id: I23c5d94f830aaf81c5d27f821c09545ddfd45df6
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-01-05 10:13:33 +00:00
hjk
d8b8c1d8a6 Core: Use icon based on document's full path
This makes a difference when one wants to e.g. mark non existing files.

Fixes: QTCREATORBUG-29999
Change-Id: Id7c2a53fa91fb9638e9a08a746614a3f04da400f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
(cherry picked from commit 13f5367611)
Reviewed-by: David Schulz <david.schulz@qt.io>
2024-01-05 09:15:59 +00:00