summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | LocatorFilters: Use ILocatorFilter::createRegExp() consistentlyJarek Kobus2023-05-122-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Utils: Add an AspectContainer::changed() signalhjk2023-05-122-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Utils: Add operator() as a way to access .value() for some aspectshjk2023-05-121-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Beautifier: Base AbstractSettings on Utils::AspectContainerhjk2023-05-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Beautifier: Base Beautifier::GeneralSettings on Core::PagedSettingshjk2023-05-127-241/+74
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | DirectoryFilter: Remove the old matchesFor() implementationJarek Kobus2023-05-124-28/+23
| | | | | | | | | | | | | | | Change-Id: Iae8a2e3adda7fdaec69873bf4b171da98eee4874 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | | CMake: Add -fPIC also for OBJECT librariesCristian Adam2023-05-123-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | VcsBase: Remove unused settings memberhjk2023-05-121-3/+0
| | | | | | | | | | | | | | | Change-Id: I3247a639d9607a4acbf5477302e1f2860325a0e6 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | | Utils: Use FilePath hash in operator==Marcus Tillmanns2023-05-121-0/+3
| | | | | | | | | | | | | | | Change-Id: Ibbea420a5a5353da221d285b70272cdf9b09d0d0 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | | Utils: Cache FilePath::qHashMarcus Tillmanns2023-05-122-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Layouting: Add a plain 'Widget' itemhjk2023-05-122-0/+12
| | | | | | | | | | | | | | | Change-Id: Id419b1efd56f51fb282b11c4b241b96eb7d7d0ae Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | | Utils: fix Text::Range length and remove midDavid Schulz2023-05-128-14/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge "Merge remote-tracking branch 'origin/10.0'"The Qt Project2023-05-125-8/+22
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/10.0'Eike Ziller2023-05-125-8/+22
| |\ \ \ | | |/ / | | | | | | | | Change-Id: I7cfdfc13097d5037fea597ecba98ae902a0c5afb
| | * | CMakePM: Cancel current build before locator "cm <target>"Cristian Adam2023-05-121-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * | GitHub Actions: Use universal for macOS only for releasesCristian Adam2023-05-121-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | For the regular checks we should be as fast as possible. Change-Id: If5b14f6ac48aebdefced137f74fc8ecdd72f741b Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| | * | ClangFormat: Remove redundant KeepLineBreaks propertyArtem Sokolovskii2023-05-121-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I74250bde4a224d89b078f127da4e7b63454b03a6 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
| | * | ClangFormat: Improve conversion from and to ClangFormat styleArtem Sokolovskii2023-05-121-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * | AutoTest: Fix handling of multiple fails of testsChristian Stenger2023-05-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Broke with d05c5b7d07194b7c0fe938e88e63cfaab9ee5f4d. Fixes: QTCREATORBUG-29146 Change-Id: If7cc7f943c16113785a21b661a545e00331f1dcd Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> Reviewed-by: David Schulz <david.schulz@qt.io>
* | | | CMakePM: Display presets as part of the project outlineCristian Adam2023-05-126-0/+58
|/ / / | | | | | | | | | | | | | | | | | | | | | 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>
* | | AutoTest: Output time taken when parsing testsMarcus Tillmanns2023-05-122-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Makes debugging easier as you don't have to calculate end - start yourself. Change-Id: Ib75a36bbf52633e188a6c4bbd488eb439cb52984 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | | Terminal: Fix Shellintegration for bashMarcus Tillmanns2023-05-121-1/+6
| | | | | | | | | | | | | | | | | | | | | bash needs long options to be before short options. Change-Id: I277a9283253f11bcb76e0366a0b6c5a0346fdfd8 Reviewed-by: hjk <hjk@qt.io>
* | | OpenDocumentsFilter: Remove the old matchesFor() implementationJarek Kobus2023-05-122-140/+14
| | | | | | | | | | | | | | | Change-Id: I1166dbd17125aa3c6bab4dae4c416063c4b6f7ba Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | | AllProjectsFilter: Remove the old matchesFor() implementationJarek Kobus2023-05-122-34/+7
| | | | | | | | | | | | | | | | | | | | | 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>
* | | TaskTree: Prepare for de-utils-ization - part 4Jarek Kobus2023-05-122-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | TaskTree: Prepare for de-utils-ization - part 3Jarek Kobus2023-05-1213-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | TaskTree: Prepare for de-utils-ization - part 2Jarek Kobus2023-05-1263-160/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | TaskTree: Prepare for de-utils-ization - part 1Jarek Kobus2023-05-121-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | CppLocatorFilters: Remove the old matchesFor() implementationJarek Kobus2023-05-127-402/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Terminal: Switch Mode to ensure visibleMarcus Tillmanns2023-05-122-4/+5
| | | | | | | | | | | | | | | Change-Id: I6d92ac07b7f6e7d5ed3fa4d27531d1cb8ec1a36f Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* | | MacroLocatorFilter: Remove the old matchesFor() implementationJarek Kobus2023-05-122-55/+2
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | BookmarkFilter: Remove the old matchesFor() implementationJarek Kobus2023-05-122-18/+2
| | | | | | | | | | | | | | | | | | | | | 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>
* | | Terminal: Fix warningAlessandro Portale2023-05-121-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Utils: Remove empty item after optionChristian Stenger2023-05-121-1/+0
| | | | | | | | | | | | | | | | | | | | | Triggers a soft assert. Change-Id: I9ad863ceb7e1f377e4f9fbae62cca1d0932a76d6 Reviewed-by: hjk <hjk@qt.io>
* | | AutoTest: Some layout polishingChristian Stenger2023-05-125-32/+26
| | | | | | | | | | | | | | | | | | | | | | | | Layouts are simpler nowadays. Some drive-by formatting changes. Change-Id: If5fd0ff8cf8e39487bfb29d792bdf2d8ddb0342c Reviewed-by: hjk <hjk@qt.io>
* | | ScxmlEditor: Fix Qbs buildChristian Stenger2023-05-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Amends 2d1b8dbc2987e6db76c78d8cb449b47e39dd1597. Change-Id: I994b98b3f5b5bd0ae8026f04ddd6c42beb9545e0 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: hjk <hjk@qt.io>
* | | Utils: Fix unused parameter warningBjörn Schäpers2023-05-111-0/+2
| | | | | | | | | | | | | | | | | | Change-Id: Ibe4c866b4f3bf39999cfe43bd32287e069e51d2c Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | | Utils: Turn StyleHelper into a namespaceAlessandro Portale2023-05-113-137/+174
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was in fact just a bag of static functions. Most importantly, it fixes a previouls introduced build error. Amends 5975657e7747052211310a9bfedaac1fa937fc19 Change-Id: Ia7de8bdcf91e1763f9d3b435316a5df9993717de Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* | | Utils: replace LineColumn with Text::PositionDavid Schulz2023-05-1110-59/+8
| | | | | | | | | | | | | | | | | | | | | 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>
* | | Utils: Guard SelectionAspect value access against out-of-bounds accesshjk2023-05-111-2/+4
| | | | | | | | | | | | | | | Change-Id: I6ca414015cb55f06b7264949487fafc7eb57efd3 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | | ProjectExplorer: Use PagedSettings for BuildPropertiesSettingsPagehjk2023-05-113-39/+20
| | | | | | | | | | | | | | | | | | | | | More compact. Change-Id: Id35c3e8eeb54039a6769730fecc6b862fefc10e1 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | | Scxmleditor: Add showing onEntry and on Exit eventsArtem Sokolovskii2023-05-118-15/+228
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Core: Make PagedSettings autoapply by default in the basehjk2023-05-119-26/+8
| | | | | | | | | | | | | | | | | | | | | Instead of relying (and forgetting...) it in all derived clases. Change-Id: I5d1dea0ace420d464c39c192278ae6e5db01de90 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | | Autotest: Use new PagedSettingshjk2023-05-1115-274/+165
| | | | | | | | | | | | | | | Change-Id: If93494ef9e3f10e1b7bbc95a3930d3b36e83f8fc Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | | Qt Quick Application Wizard: Fix a property assignmentAlessandro Portale2023-05-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | The option "BuildSystem" does not exist, anymore. Amends: fe45294357c91385a09bb3bc914e7047081218b1 Change-Id: I76aa3fe05cf1a4a4f74944d67d3fa7c6c273af6a Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | | ClangFormat: column of Position is 0-basedDavid Schulz2023-05-111-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Amends 5b0c3258bb56fb4de71c28340857761641fe9aa7 Amends e9cd4dd4392a7f82f41d9ca1af7e030b532d756d Amends a631a0441e011d0c28f7a5dbf7810c826252f5cf Change-Id: I9dd542dfdf7936bdaf1fb05152228aff3895bccf Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | | Utils: Add more FilePathChooser config options to StringAspecthjk2023-05-112-0/+30
| | | | | | | | | | | | | | | | | | | | | Will be used in the Beautifier plugin. Change-Id: I6e70f757a25afcdf1d3e3742357d71503f210b2a Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | | ClangFormatBaseIndenter: Fix buildJarek Kobus2023-05-111-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | Bring back the utf16LineColumn function locally. Amends e9cd4dd4392a7f82f41d9ca1af7e030b532d756d Change-Id: Ic10ea0355b75498217e7bc057a3666a276a18a11 Reviewed-by: hjk <hjk@qt.io>
* | | LocatorWidget: Further simplificationsJarek Kobus2023-05-112-73/+32
| | | | | | | | | | | | | | | | | | Change-Id: Ia3a5eade7f49d45d08539b6bb3d2cbaf9fa12242 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* | | ClangFormat: Compile fix related to LineColumnshjk2023-05-111-0/+1
| | | | | | | | | | | | | | | Change-Id: I645d448bea8ee22db54b110cf83e58b7b2e20660 Reviewed-by: David Schulz <david.schulz@qt.io>
View Lorry Controller Status