Commit Graph

80509 Commits

Author SHA1 Message Date
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
hjk
0449a3fdab Autotest: Use new PagedSettings
Change-Id: If93494ef9e3f10e1b7bbc95a3930d3b36e83f8fc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-05-11 13:43:47 +00:00
Alessandro Portale
9b00ab8d79 Qt Quick Application Wizard: Fix a property assignment
The option "BuildSystem" does not exist, anymore.

Amends: fe45294357

Change-Id: I76aa3fe05cf1a4a4f74944d67d3fa7c6c273af6a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-05-11 13:24:52 +00:00
David Schulz
74c311d68f ClangFormat: column of Position is 0-based
Amends 5b0c3258bb
Amends e9cd4dd439
Amends a631a0441e

Change-Id: I9dd542dfdf7936bdaf1fb05152228aff3895bccf
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-05-11 13:20:39 +00:00
hjk
7bd3ee8123 Utils: Add more FilePathChooser config options to StringAspect
Will be used in the Beautifier plugin.

Change-Id: I6e70f757a25afcdf1d3e3742357d71503f210b2a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-05-11 12:47:59 +00:00
Jarek Kobus
a631a0441e ClangFormatBaseIndenter: Fix build
Bring back the utf16LineColumn function locally.

Amends e9cd4dd439

Change-Id: Ic10ea0355b75498217e7bc057a3666a276a18a11
Reviewed-by: hjk <hjk@qt.io>
2023-05-11 12:03:17 +00:00
Jarek Kobus
b8390d3544 LocatorWidget: Further simplifications
Change-Id: Ia3a5eade7f49d45d08539b6bb3d2cbaf9fa12242
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-05-11 11:43:25 +00:00
hjk
a69f58180c ClangFormat: Compile fix related to LineColumns
Change-Id: I645d448bea8ee22db54b110cf83e58b7b2e20660
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-05-11 11:23:26 +00:00
David Schulz
80f46c28a5 Utils: fix build
Change-Id: Ibc9050c8b3dd4a1fcba9e87f70b46908dbbd1dce
Reviewed-by: hjk <hjk@qt.io>
2023-05-11 11:00:11 +00:00
David Schulz
e9cd4dd439 Utils: use Text::Position instead of LineColumn in textutils
Change-Id: I606b0b4f8106bdb2f97383d6c81ac065e7e61858
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-05-11 10:46:01 +00:00
David Schulz
5a0f2e6d15 Utils: move extractFromFileName from LineColumn to Text::Position
Change-Id: Ibb2465e66c280d4201377921f69741a050d94bc1
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-05-11 10:45:49 +00:00
Jarek Kobus
7d87233c9c ClangCodeModel: Remove the old matchesFor() implementation
Rename some filter classes to conform to the names for cpp filters.
Remove some unneeded intermediate classes now.

Change-Id: Ib4fa295fa60da61c42c792556751d954ddb936e7
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-05-11 10:24:08 +00:00
Jarek Kobus
74f6b96315 CppIncludesFilter: Remove the old matchesFor() implementation
Change-Id: I8c65041e22195ecb44e32a8102800c2020298f71
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-05-11 09:21:41 +00:00
Eike Ziller
7f5876b45a Merge remote-tracking branch 'origin/10.0'
Change-Id: I98e5e1ad43103984b490c65cdeed84b7414303b3
2023-05-11 10:33:18 +02:00
Artem Sokolovskii
7960c1f3f6 ClangFormat: Fix code style preferences are grayed out
Code style preferences are grayed out even when formatting mode
is set to disable.

Fixes: QTCREATORBUG-29129
Change-Id: Icf82fa0751f9291122c2af55111b6bd5fac85c7b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-05-11 08:11:54 +00:00
Björn Schäpers
2455ff28cd Debugger: Fix defined but not used warning
Move the currentError function where it is used.

Change-Id: Iba669d677b35abc0c9291572c2ccb1df3cd2ed56
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-05-11 08:06:17 +00:00
Leena Miettinen
670d36a931 Doc: Don't mention qmake in Qt Quick debugging instructions
The same field is available for both qmake and CMake projects.
Use a screenshot from a CMake project.

Also point to "Preferences > Build & Run > Default Build Properties"
for globally enabling QML debugging and explain what "Use Project Default"
and "Leave at Default" mean.

Fixes: QTCREATORBUG-29089
Change-Id: I3d007d10ca3247dc387eaf21d4d4623d7e90167d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-05-11 07:31:32 +00:00
Christian Stenger
37cf70aeba Squish: Redo layout of settingspage
Change-Id: I0622423a25942d803f38e85cb4aecd57024666a9
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-05-11 06:37:28 +00:00
Jarek Kobus
4b851bbb01 FileSystemFilter: Remove the old matchesFor() implementation
Change-Id: I21e714a7cd89e82eb408f89bfe1271c91758f13a
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-05-11 06:29:20 +00:00
David Schulz
24aea361b7 Utils: remove OptionalLineColumn
LineColumn already has a isValid() that is sufficient for the use case.

Change-Id: I7f6e1d64b66a9af05d74ce0ef45717265dc28ed3
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-05-11 05:53:56 +00:00
David Schulz
5b0c3258bb Utils: Make column of LineColumn consistently 0-based
Change-Id: I4ab153d1c55653936efbcdc13ac04463185930e0
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-05-11 05:53:49 +00:00
David Schulz
edeea10e6a CodeAssistant: block suggestions while proposal is visible
Change-Id: I78068306252c5c32304ea97e3abb2d87fdee7832
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-05-11 05:50:24 +00:00
David Schulz
0b8a0f8f59 Copilot: remove unused function and member
Change-Id: I77bc6533f658dbd6c3b58f603f384e6c516974df
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-05-11 05:50:19 +00:00
Alessandro Portale
17ca266b5f Vcpkg: Use new PagedSettings
Change-Id: I75d1b61a05efa630db080a2750d214636c02b5d9
Reviewed-by: hjk <hjk@qt.io>
2023-05-11 05:26:50 +00:00
hjk
98d9ad8b3c Docker: Use PagedSettings
More compact.

Change-Id: Ic21c6ea9e7faf67e5f507f336f18e1134b371a97
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-05-10 16:23:21 +00:00
hjk
20f237baf2 Nim: Use PagedSettings for Tools settings page
Change-Id: Iee5f4a89380499d781a42c3e0b6bc82b7386c28e
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-05-10 15:34:14 +00:00
hjk
47e0e9be29 Core: PagedSettings, next attempt
We cannnot pass the LayoutItem directly but need the lambda
to postpone creation of aspect subwidgets until the settings
page gets into view.

Change-Id: I420e82f66fd5c4781451d6851cc38368e7501abc
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-05-10 15:22:49 +00:00
hjk
72e30b69c5 CMake: Use new PagedSettings
More compact.

Change-Id: Ie800e52b98d23e1acd1deba9d6b6e5f778c016bb
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-05-10 15:22:39 +00:00
hjk
3f5d33fe5c CppEditor: Fix an error raised by Clang 16
error: integer value -1 is outside the valid range of values [0, 255]
 for this enumeration type [-Wenum-constexpr-conversion]

Change-Id: I1b029099634dcc8f11071aad6a974ec0c41077ce
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-05-10 15:21:07 +00:00
hjk
699b804181 ProjectExplorer: Rename 'Device' into 'Run device' in Kit settings
Similar for 'Run device type'. Less ambiguity.

Change-Id: Iab88009b92ae760f14140ac8bbdadea51d6dfad4
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2023-05-10 14:55:48 +00:00
Jarek Kobus
fb3b9d2268 CommandLocator: Remove the old matchesFor() implementation
Change-Id: Ide5f9141bc756059aadc561800b34e7c4fffa5cf
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-05-10 14:32:08 +00:00
hjk
529ade9f08 Android: Use functor to apply changed settings
Change-Id: I12a62dd4aa34ba3c23b0569e3b2724c2d7415ded
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-05-10 13:53:58 +00:00
hjk
6891f0f157 AutoTest: Remove layout hack from CatchTestSettings page
Does not look needed anymore.

Change-Id: Ie00b60521b7e41039161978b195d00d2162ce95b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-05-10 13:40:24 +00:00
hjk
c2265077f6 TestSettings: Use functor to apply changed settings
Baby-steps towards use of aspects.

Change-Id: I08a0db083c29e754cf58a631dc3a5c36f400ee96
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-05-10 13:37:46 +00:00
Alessandro Portale
e44d0c57dc Utils: Fix the applying of new base color at run-time
If the base color was changed via the color picker that opens with
shift-click on the upper left toolbar area, some widgets were not
instantly updated with the new color.

This change ensures that all (visible) widgets instead of just all top
level windows get updated after changing the color. While this method is
potentially more expensive, it does not effect the start-up negatively,
because on start-up StyleHelper::setBaseColor() gets called before the
mainwindow is shown.

Fixes: QTCREATORBUG-29135
Change-Id: I227c2f243ffcd9f8210b9d2d1a47ad0494663d50
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-05-10 13:25:19 +00:00
Alessandro Portale
5975657e77 Utils: Centralize style-related property names as constants
This introduces string constants in Utils::StyleHelper. They are used by
code all over in Qt Creator to tell ManhattanStyle how to paint certain
widgets.

Change-Id: Iecca36103f80084cd5fe93fcb6b18b8fbb3a32bb
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-05-10 13:25:10 +00:00
Eike Ziller
6865635442 Markdown: Save and restore state
This restores the state of the markdown editor, including text editor
state, preview scroll position and button states, when closing and re-
opening a file.

Change-Id: Ibf1cadd5e0e80149123c6c5f599157e931330343
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-05-10 13:02:25 +00:00
Eike Ziller
349a3a5872 Markdown: Save visible views as default
Remember if editor and/or preview are visible and use it as default for
when a markdown editor is opened.

Change-Id: I19414adfd118003628783fadeae472b7bb7915f5
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-05-10 13:02:15 +00:00
Jarek Kobus
062db6b3a5 LocatorFiltersFilter: Remove the old matchesFor() implementation
Change-Id: I28bef914103b3650badf1ec44fdcd4a1081384dc
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-05-10 12:55:25 +00:00
Jarek Kobus
475e859462 LineNumberFilter: Remove the old matchesFor() implementation
Change-Id: Ia45de8cd265300776c9cb0660b491f9584620a14
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-05-10 12:55:14 +00:00
Jarek Kobus
2950762cb1 JavaScriptFilter: Remove the old matchesFor() implementation
Change-Id: I5a799238d3aae3ae342580e58af4d6993618f101
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-05-10 12:55:03 +00:00
Jarek Kobus
19834f5986 HelpIndexFilter: Remove the old matchesFor() implementation
Change-Id: I867520fc790832c93381f390bcd74e4908086461
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-10 12:47:30 +00:00