Commit Graph

81484 Commits

Author SHA1 Message Date
hjk
5a318df0ee Perforce: Don't use Option page as guard object
There's a plan to remove the QObject base from IOptionPage

Change-Id: I142d2323f86e46d7758f8bd9a65c988988a18ed1
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-05-08 14:01:41 +00:00
hjk
1b4aa44e89 QmlDesignerBase: Remove the dependency on IOptionPage's QObject base
The base will be cut soonish, and the only use here was tr() with
a (wrong) context. Use StudioSettingsPage for that now.

Change-Id: I41e4b737713591e002c126bbf97226de7c3f784f
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-05-08 13:39:59 +00:00
hjk
3f1a75eacc Git: Small simplification to Gerrit "plugin" setup
The indirection is not needed. It's not really stand-alone, and not
touched before GitPlugin::initialize().

Change-Id: If8552dc69ff9efa18a3f1d6d998a8f28ab65e501
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-05-08 13:25:48 +00:00
Christian Kandeler
7808195f74 CppEditor: Refactor "insert member from use" quickfixes
The interfaces make much more sense now, and the coding style is taken
into account (except for the fallback case where the user enters the
type).

Change-Id: If08dfc41ebd63287fb5b0b187944e7fdf08b0823
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-05-08 13:09:44 +00:00
hjk
80a425acba Core: Remove QObject inheritance of IOptionsPageProvider
This was not really used.

Change-Id: I86049697d211d88827a9633b367d2121fa8d1f1c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-05-08 12:40:26 +00:00
David Schulz
e3e17c4586 Editor: Fix initial enabled state of margin settings
Change-Id: I0adff884743dd8301a9c7f8b7a44f94658af4b5f
Reviewed-by: hjk <hjk@qt.io>
2023-05-08 12:31:47 +00:00
hjk
851f317199 Core: Remove parent pointer from IOptionPage constructor
Not used anymore.

Change-Id: Ic44ce021b1f952337a3193454b5b6649d5847446
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-05-08 12:27:32 +00:00
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
Tim Jenssen
4b26269131 QmlDesigner: ModelNode model can be null
Change-Id: Ie73bc1346805cf6137edeea5550d0ba5288ecdb4
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-05-08 12:01:10 +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
Marco Bubke
b91279e8d0 QmlDesigner: Remove constructor implementation in import
Change-Id: I4cf5207ac0fd5fd17466f08367061f43c9ed9196
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-05-08 11:37:03 +00:00
Marco Bubke
4be3f6b5e9 QmlDesigner: Improve version handling
Consolidate version handling in imports. It has drawbacks if we copy
code to different places in our code base. Having tests for the version
conversion has advantages too.

The invalid version has not anymore using -1 but the maximum integer as
indicator because an empty version is higher than any other version.

Change-Id: I8608b9509660f4253e8e5ba7397d964defe35e51
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-05-08 11:35:59 +00:00
Marco Bubke
1e84065123 QmlDesigner: Improve major version conversion
It handles now the case that it cannot covert to integer and it is not
anymore allocating memory.

Change-Id: Ie00a7abb5d3e8c6307c5ae6528dca29ebc47ba45
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-05-08 11:34:48 +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
Christian Stenger
63522999ee Avoid crash on close
Private may not have been initialized in case QC gets stopped
before it could be.

Change-Id: I4b6cf6755dd6803834f956e2e125bc1c5f1d929f
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-05-08 11:21:42 +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
Marco Bubke
5b9950c5d0 QmlDesigner: Make meta info system mockable
Using the projectstorage mechanism we introduce a flag for the test, so
we can use ProjectStorageInterface instead of ProjectStorage. It has the
overhead of a virtual function interface but for the test that is
neglectable. In the test we can now use a project storage mock to
emulate the meta info system. Later we could use a pregenerated database
file to create a fake project storage.

Task-number: QDS-9766
Change-Id: I16efa28bc4b12181941adecc132084157156daec
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-05-08 11:18:15 +00:00
Thomas Hartmann
2ee225b037 QmlDesigner: fix hardcoded types for Qt 6.5.1
Task-number: QDS-9737
Change-Id: I286d706b506904b4d6f22549d1ec294d16859df0
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-05-08 11:09:55 +00:00
Miikka Heikkinen
1fd124bc27 QmlDesigner: Fix unused warning
Change-Id: I352346308c1c150a8309b25e9d8f74c6aadaa146
Reviewed-by: Burak Hancerli <burak.hancerli@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-05-08 11:09:29 +00:00
Marco Bubke
32f84fc05a QmlDesigner: Move Version to different namespace
We want to use it not only for synchronization.

Task-number: QDS-9766
Change-Id: I26a2ade8203d9c5131e8dec101885434713f8252
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-05-08 10:52:20 +00:00
Marco Bubke
c1c90ebd1c QmlDesigner: Use fully qualified namespace
There can be ambiguities with other Utils namespaces.

Change-Id: I84c79fd380115160dd6070f67cb80ccf00c20ca5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-05-08 10:42:34 +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
Samuel Ghinet
2bf16bd692 QmlDesigner: Fix crash upon creation of wizard
Task-number: QDS-9532
Change-Id: I2ce4e6e9597798a023c626c6b8e5dee6a1570e03
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-05-08 01:42:19 +00:00
Samuel Ghinet
4f11fae460 QmlDesigner: Fix crash in FileExtractor when compressed size is 0
Task-number: QDS-9832
Change-Id: Ia096b5770359ea16171cae0634fea340264194e1
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-05-08 01:40:47 +00:00