Commit Graph

80400 Commits

Author SHA1 Message Date
Christian Stenger
9c2fa5c975 Perforce: Fix testing settings
Changed settings had been taken into account only after
an explicit Apply and this may be rather confusing.

Change-Id: I344ddf18a3cb15b0bc2d2b41a38587395b592e46
Reviewed-by: hjk <hjk@qt.io>
2023-05-15 04:52:55 +00:00
Christian Stenger
985c1ee3e9 Perforce: Do not wait for process if not set up
The process could be not set up correctly or at all if
we exit the start function early.
Avoids a soft assert.

Change-Id: I9f0d71acc4a440b85dbb26fa656e0b551ae685f4
Reviewed-by: hjk <hjk@qt.io>
2023-05-15 04:52:19 +00:00
Orgad Shaneh
64d1f49078 Autotest: Fix struct/class misalignment
Amends 30af7a9503.

Change-Id: Ie8ca92c427fc3446727d78a76aee492eb789b7ed
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-05-15 04:50:18 +00:00
hjk
ab8f3d78ae Utils: Use QAbstractButton instead of QCheckBox in BoolAspect
Opens the path to use e.g. QRadioButton.

Change-Id: Idb1591c0a1486181b8aeb51edb93bc4bfecef834
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-05-12 16:17:49 +00:00
hjk
c85b72000f All: Use the shorter access to aspect values in a few places
Change-Id: Ie0ff0e4e1cf4c2750897ea733dfccb743f44fa93
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-05-12 16:04:38 +00:00
hjk
30af7a9503 AutoTests: Aspectify parts of main settings
Change-Id: I407b5102e1f2a6647f6fdca01a61dfa422c5d3ee
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-05-12 14:54:24 +00:00
hjk
4c1a161abd Utils: Fix some IntegerAspect value display issue
... when a display scale factor was set.

Change-Id: I764db99e444f9cc70871c3dbec101d0b65542c4a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-05-12 14:54:01 +00:00
Jarek Kobus
2b54ef80d1 LocatorFilters: Use ILocatorFilter::createRegExp() consistently
Use it consistently inside ILocatorFilter subclasses, instead
of FuzzyMatcher.
Drop repeated default arguments from the caller.

Change-Id: I53762f27216a30ed0281f3d0ddc5e50c7452559a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-05-12 14:32:49 +00:00
hjk
5cf5b1ae3f Utils: Add an AspectContainer::changed() signal
In contrast to applied() only emitted if anything was dirty before.

Ideally, applied() would not be needed, but I am not sure about
downstream uses.

Change-Id: Ie0c293b8730c503fc4409884a33207ee9ca5f129
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-05-12 14:29:11 +00:00
hjk
ddee1c92a4 Utils: Add operator() as a way to access .value() for some aspects
This can make the user code look a bit nicer.

Change-Id: I98867114810ede2f04342144f600682ff3c261b4
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-05-12 14:28:18 +00:00
hjk
cfbdee3a3b Beautifier: Base AbstractSettings on Utils::AspectContainer
Plan is to eliminate AbstractSettings as much as possible and
use Aspect functionality instead.

Change-Id: Idb71fb4df0893ffa4713b0182c21725f0c71089e
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-05-12 13:50:53 +00:00
hjk
7dd27301ab Beautifier: Base Beautifier::GeneralSettings on Core::PagedSettings
This also uses the "Enable auto format on file save" bool directly
for the now-checked group box.

Change-Id: I7f3f392828f6ccfda99fa1d757f49cb9e3b6bc1b
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-05-12 13:12:10 +00:00
Jarek Kobus
0672314844 DirectoryFilter: Remove the old matchesFor() implementation
Change-Id: Iae8a2e3adda7fdaec69873bf4b171da98eee4874
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-05-12 13:11:25 +00:00
Cristian Adam
0dbc208a07 CMake: Add -fPIC also for OBJECT libraries
add_qtc_library would have set the POSITION_INDEPENDENT_CODE property
for STATIC libraries on UNIX based systems.

The OBJECT libraries need the same treatment.

Change-Id: Ia333a36ea0f35d7db3ed876cdde5b895b47644c7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-05-12 12:49:05 +00:00
hjk
fc8ae0e2dc VcsBase: Remove unused settings member
Change-Id: I3247a639d9607a4acbf5477302e1f2860325a0e6
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-05-12 11:59:56 +00:00
Marcus Tillmanns
69fbe72752 Utils: Use FilePath hash in operator==
Change-Id: Ibbea420a5a5353da221d285b70272cdf9b09d0d0
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-05-12 11:47:08 +00:00
Marcus Tillmanns
6149fd8bfa Utils: Cache FilePath::qHash
Calling toCaseFolded is expensive if the same filepath is hashed
often, so we calculate the hash value once and cache the result.

One such case was found to happen when parsing tests,
as the cpp parser is queried a lot and it uses hash maps / sets
with filepaths.

Change-Id: Ic3ca7f09e8f108f5a89b3fdb17743ae7c3258001
Reviewed-by: hjk <hjk@qt.io>
2023-05-12 11:34:18 +00:00
hjk
ed6f5e3486 Layouting: Add a plain 'Widget' item
Change-Id: Id419b1efd56f51fb282b11c4b241b96eb7d7d0ae
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-05-12 11:21:15 +00:00
David Schulz
1a98dda5c4 Utils: fix Text::Range length and remove mid
Those functions are based on the assumption that the passed text starts
at the begin position, which was good enough for search results, but if
used in other parts of the codebase it might give unwanted results.
Calculate the length of the range now as expected and subtract the
beginning lines.
In order to still got the correct results for the text result texts
modify the result range to always start at the first line before
calculating the length of the range.
Also add tests for the modified functionality

Change-Id: I7ccd75b642dda6dd4f738877cbe3543d46c03652
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-05-12 11:03:33 +00:00
The Qt Project
70609cdec6 Merge "Merge remote-tracking branch 'origin/10.0'" 2023-05-12 10:42:27 +00:00
Eike Ziller
51df19270b Merge remote-tracking branch 'origin/10.0'
Change-Id: I7cfdfc13097d5037fea597ecba98ae902a0c5afb
2023-05-12 12:24:39 +02:00
Cristian Adam
dc18d4b9ee CMakePM: Display presets as part of the project outline
Fixes: QTCREATORBUG-28966
Change-Id: Iae0f77956bf6f4682ea8a25e08d05de3331c7420
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2023-05-12 10:21:53 +00:00
Marcus Tillmanns
aca8e5906b AutoTest: Output time taken when parsing tests
Makes debugging easier as you don't have to calculate
end - start yourself.

Change-Id: Ib75a36bbf52633e188a6c4bbd488eb439cb52984
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-05-12 10:17:05 +00:00
Marcus Tillmanns
161cac0a85 Terminal: Fix Shellintegration for bash
bash needs long options to be before short options.

Change-Id: I277a9283253f11bcb76e0366a0b6c5a0346fdfd8
Reviewed-by: hjk <hjk@qt.io>
2023-05-12 09:35:43 +00:00
Jarek Kobus
3e3a202e75 OpenDocumentsFilter: Remove the old matchesFor() implementation
Change-Id: I1166dbd17125aa3c6bab4dae4c416063c4b6f7ba
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-05-12 08:59:27 +00:00
Cristian Adam
af5e50edf7 CMakePM: Cancel current build before locator "cm <target>"
In case the current project is building and the user starts a "cm
<target>" in Locator, now the build is canceled before starting a a
"cmake --build --target <target>".

Fixes: QTCREATORBUG-26699
Change-Id: I27ed9ba5b8d917dce94835a5462e4e64e7515bd9
Reviewed-by: hjk <hjk@qt.io>
2023-05-12 08:17:17 +00:00
Jarek Kobus
62c309eeda AllProjectsFilter: Remove the old matchesFor() implementation
Change-Id: I9b5a0a1483e1dcd55d845ca2a5645ad9a4d05b52
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-05-12 08:13:42 +00:00
Jarek Kobus
a1792c653e TaskTree: Prepare for de-utils-ization - part 4
Add internal implementation for qtcassert.{c,h}.

Change-Id: I646b302be2f86e32e91c8c6fafa7b799e48773c2
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
2023-05-12 08:09:30 +00:00
Jarek Kobus
fe470d60a2 TaskTree: Prepare for de-utils-ization - part 3
Rename QTC_* macros into TASKING_*.

Change-Id: I809ebf678f20df612a3211c38ebbfe6d4bf6492d
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-05-12 08:09:24 +00:00
Jarek Kobus
97a66067bb TaskTree: Prepare for de-utils-ization - part 2
Move TaskTree into Tasking namespace.
Move Tasking namespace out of Utils namespace.

Change-Id: Ib4c1d7f54f1808517e54768dfa27209c33517b61
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
2023-05-12 08:09:19 +00:00
Jarek Kobus
5a73d07c72 TaskTree: Prepare for de-utils-ization - part 1
Add internal implementation for Guard/GuardLocker.

Change-Id: I9bcedee937221c0796143be2f943650a1bb56f38
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
2023-05-12 08:09:13 +00:00
Cristian Adam
430f07cf38 GitHub Actions: Use universal for macOS only for releases
For the regular checks we should be as fast as possible.

Change-Id: If5b14f6ac48aebdefced137f74fc8ecdd72f741b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-05-12 08:06:52 +00:00
Artem Sokolovskii
b28df28660 ClangFormat: Remove redundant KeepLineBreaks property
Change-Id: I74250bde4a224d89b078f127da4e7b63454b03a6
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-05-12 07:49:40 +00:00
Artem Sokolovskii
ef06d89255 ClangFormat: Improve conversion from and to ClangFormat style
Improved conversion from ClangFormat style settings to
CppCode style settings and the other way around.

Task-number: QTCREATORBUG-29069
Change-Id: If4f75259f7fe77397fc144a83370749a49d25297
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-05-12 07:49:35 +00:00
Jarek Kobus
b1d520c6b1 CppLocatorFilters: Remove the old matchesFor() implementation
Move the implementation of CppCurrentDocumentFilter into
cpplocatorfilter.h/cpp.

Rename CppLocatorFilter into CppAllSymbolsFilter to
conform to the other names.

Remove some unneeded intermediate classes now.

Change-Id: Ia911dc826b83ba11894757fc353ff72211910ff7
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-05-12 06:45:27 +00:00
Marcus Tillmanns
0c8ae843c6 Terminal: Switch Mode to ensure visible
Change-Id: I6d92ac07b7f6e7d5ed3fa4d27531d1cb8ec1a36f
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-05-12 06:41:13 +00:00
Jarek Kobus
946da55f6e MacroLocatorFilter: Remove the old matchesFor() implementation
Change-Id: I44869742c590125805eab277464ffde3df3a2bc2
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
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-12 06:40:57 +00:00
Jarek Kobus
c559bcc4b1 BookmarkFilter: Remove the old matchesFor() implementation
Change-Id: I85b02fcaf73686146fe4da9d8582dd0c677ba101
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-05-12 06:40:49 +00:00
Alessandro Portale
f2213db913 Terminal: Fix warning
warning: dereferencing type-punned pointer will break strict-aliasing
rules [-Wstrict-aliasing]

Change-Id: Ib66cbde9ff48f31d1a5ca97c8bafb0efd419dc2e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2023-05-12 06:34:49 +00:00
Christian Stenger
979f938aa5 AutoTest: Fix handling of multiple fails of tests
Broke with d05c5b7d07.

Fixes: QTCREATORBUG-29146
Change-Id: If7cc7f943c16113785a21b661a545e00331f1dcd
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-05-12 06:34:09 +00:00
Christian Stenger
1a86c7bed4 Utils: Remove empty item after option
Triggers a soft assert.

Change-Id: I9ad863ceb7e1f377e4f9fbae62cca1d0932a76d6
Reviewed-by: hjk <hjk@qt.io>
2023-05-12 06:22:17 +00:00
Christian Stenger
d14f1af523 AutoTest: Some layout polishing
Layouts are simpler nowadays. Some drive-by formatting
changes.

Change-Id: If5fd0ff8cf8e39487bfb29d792bdf2d8ddb0342c
Reviewed-by: hjk <hjk@qt.io>
2023-05-12 06:21:58 +00:00
Christian Stenger
1dfaecfb1e ScxmlEditor: Fix Qbs build
Amends 2d1b8dbc29.

Change-Id: I994b98b3f5b5bd0ae8026f04ddd6c42beb9545e0
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2023-05-12 06:21:50 +00:00
Björn Schäpers
b8a82d824b Utils: Fix unused parameter warning
Change-Id: Ibe4c866b4f3bf39999cfe43bd32287e069e51d2c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-05-11 19:06:21 +00:00
Alessandro Portale
fb406a26f4 Utils: Turn StyleHelper into a namespace
It was in fact just a bag of static functions. Most importantly, it
fixes a previouls introduced build error.

Amends 5975657e77

Change-Id: Ia7de8bdcf91e1763f9d3b435316a5df9993717de
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-05-11 17:10:40 +00:00
David Schulz
1acd2499e2 Utils: replace LineColumn with Text::Position
Change-Id: Ia69547374efec7412717cbed1eb4162162a89d39
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-05-11 17:00:28 +00:00
hjk
268da290b2 Utils: Guard SelectionAspect value access against out-of-bounds access
Change-Id: I6ca414015cb55f06b7264949487fafc7eb57efd3
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-05-11 15:08:17 +00:00
hjk
67acfd7076 ProjectExplorer: Use PagedSettings for BuildPropertiesSettingsPage
More compact.

Change-Id: Id35c3e8eeb54039a6769730fecc6b862fefc10e1
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-05-11 14:27:25 +00:00
Artem Sokolovskii
2d1b8dbc29 Scxmleditor: Add showing onEntry and on Exit events
This commit enhances the SCXML Editor by adding a new
feature that enables the display of onEntry and onExit
events in the state item. This feature provides developers
with a more comprehensive view of the state machine's behavior,
allowing them to better understand the transitions that occur
when entering or exiting a particular state.

Fixes: QTCREATORBUG-17378
Change-Id: Iaf84af209d9acf13bd4183f7da9acbcd6c1c8214
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-05-11 13:59:41 +00:00
hjk
5614696002 Core: Make PagedSettings autoapply by default in the base
Instead of relying (and forgetting...) it in all derived clases.

Change-Id: I5d1dea0ace420d464c39c192278ae6e5db01de90
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-05-11 13:43:58 +00:00