Commit Graph

80400 Commits

Author SHA1 Message Date
Eike Ziller
bd660aaf27 CMake: Fix setting additional project files for file watching
Amends d8be2491a5

The change above introduced FileApiReader::takeCMakeFileInfos and uses
it to move the information about additional CMake files out of the
FileApiReader. But that now emptied variable was later used to inform
the project about these additional files. So, that broke the automatic
running of CMake when project files (except the toplevel one) changes.
Instead use the list of additional files that now lives in the
CMakeBuildSystem for that purpose.

Change-Id: I1062593029880af9d4c70e72e1bd101d40ad0c00
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-05-08 12:23:10 +00:00
hjk
41b6ecf502 Fix environment auto test
Amends 1e1befd9eb.

Change-Id: Iecd06ee06081057208a2b3387d618142dc74d0bd
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-05-08 12:03:52 +00:00
hjk
6f253b0694 VcsBase: Move some private pieces off vcsplugin.h
By themselves not worth a pimpl, but since we have one already...

Change-Id: I867e68c5e82f71ebbe16a55eb190d87f981a550b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-05-08 11:58:38 +00:00
Eike Ziller
4a2a1c2978 FakeVim: Fix build with Qt 6.6
The connect doesn't work with incomplete type FakeVimHandler::Private
anymore, so move the code.

Change-Id: I686cd19a985f965cebf7d0a927cff4dc80ae746d
Reviewed-by: hjk <hjk@qt.io>
(cherry picked from commit e56e3b6f37)
2023-05-08 11:39:03 +00:00
hjk
aa8a76c357 GitLab: Use apply functor in GitLabOptionsWidget
Babystep towards removing QObject inheritance of IOptionsPage

Change-Id: Ib36b8ce4dd1f6878abdfe20c0c4e3ddb95e927dd
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-05-08 11:29:51 +00:00
Christian Kandeler
de859dfd43 CppEditor: Do not call Snapshot::filesDependingOn()
... in document processor callback. The dependency table seems to get
rebuilt more often than expected, making this operation expensive.
Amends 6d805195f6.

Change-Id: I1eace180b2428756b648fa1c58eb0fb66cce3c0c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-05-08 11:28:25 +00:00
hjk
b03808031a VcsBase: Use functor for apply in CommonSettingsWidget
More compact.

Change-Id: Ib5985b9aa6fb9fcbe9ff1fffdc17c6c0888f786e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-05-08 11:20:26 +00:00
David Schulz
06b0d105dc Editor: simplify font to display options page connection
Operating on saved settings is less error prone and easier to maintain.

Change-Id: I92e3a6b52296cddc302ba2e4410edfd243b8ad32
Reviewed-by: hjk <hjk@qt.io>
2023-05-08 11:20:24 +00:00
Eike Ziller
5cb0a56296 Markdown: Delay update of preview
Delay the update: The implementation in Qt is currently very slow, and
while we don't have a fix, editing with immediate update is very
sluggish.

Also do not update the preview, if it isn't visible.

Change-Id: I35e10af232064b02a36a8be3758ea0bbc5b66f40
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-05-08 10:36:19 +00:00
hjk
ce00785efb Core: De-QObject-ify bits of mime settings
Change-Id: Ib4ffabe6392b5923cb6cce596e3e3563c9d6b7a3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-05-08 10:00:41 +00:00
David Schulz
0e4a7d5207 Utils: Avoid watching directories of watched files
Do not watch directories unconditionally, but only if they contain
removed files to check whether those files are readded. This should
reduce the number of needlesly watched directories to a minimum and fix
performance regressions introduced by
61598eca15.

Fixes: QTCREATORBUG-28957
Change-Id: I8fe387e7de32b0fb585074330c7f6ca7eae44730
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2023-05-08 09:39:21 +00:00
hjk
a7277bfb20 UpdateInfo: Remove now unused Q_OBJECT from SettingsPage
Change-Id: If5ff4d37816089114d952af934d0dd6fe4acb70a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-05-08 09:15:35 +00:00
hjk
0f10c6df33 TextEditor: Remove now unused Q_OBJECT from BehaviorSettingsPage
Change-Id: I0919200ddc8bb8b4547316c0af68f5aafa5d4892
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-05-08 09:15:27 +00:00
hjk
ed4c936cfc Core: Remove unused Q_OBJECT from LocatorSettings page
Change-Id: I75698496ebaa13284cb0d134aa313f608d7b7edd
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-05-08 08:58:56 +00:00
hjk
cd06a608db Autotest: Move update connection from GTestSettingsPage
... to GTestSettings to prepare for removing the QObject base
of IOptionsPage.

Change-Id: I2d6f78e4f2a1d3690860c40b4ab55008034457a9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-05-08 08:51:07 +00:00
hjk
0faed9dda4 QmlDesigner: Remove unused PuppetBuildProgressDialog
Change-Id: Id2e9da8c4fea128105cefe37d3c99ca5537d3acf
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-05-08 08:45:03 +00:00
hjk
fb5efd01b5 LanguageClient: Explicitly qualify one QObject::connect
Not needed currently but will be once an IOptionPage loses its
QObject base dependency.

Change-Id: Ide7de1a34ff62c32d63a77040e9ec59bb42e3c40
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-05-08 08:44:48 +00:00
hjk
deec92b631 Debugger: Don't put option page into the central object pool
Apparently not used anymore.

Change-Id: Ie73e09aad04574460221ffaff0c4e6cfe50873e6
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-05-08 08:14:12 +00:00
Eike Ziller
e56e3b6f37 FakeVim: Fix build with Qt 6.6
The connect doesn't work with incomplete type FakeVimHandler::Private
anymore, so move the code.

Change-Id: I686cd19a985f965cebf7d0a927cff4dc80ae746d
Reviewed-by: hjk <hjk@qt.io>
2023-05-08 07:50:29 +00:00
David Schulz
78fe0c315e Debugger: fix vanishing editor tooltip on expand
fetchMore is called multiple times before expandNode and seems to
invalidate the index that is passed to expandNode. Since we only need to
fetch more when we want to expand the item we might as well just
integrate the code of fetch more into expandNode.

Fixes: QTCREATORBUG-29083
Change-Id: I0e60e9bb03b53de2e86eea232fb5bb98046bbb80
Reviewed-by: hjk <hjk@qt.io>
2023-05-08 07:46:00 +00:00
Semih Yavuz
cd73f8c6b8 qmljsreformatter: don't default foreach type to "in"
Fixes: QTCREATORBUG-29123
Change-Id: I4d3a611c359946c4483388cbf18a0b6f16d0a8d6
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2023-05-08 07:39:26 +00:00
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