summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* ProjectExplorer: Remove redundant return in CustomToolChainOrgad Shaneh2022-10-311-1/+0
| | | | | | | Amends c15e09e0fe880c58ad39d5d8d0a1baeb84fc7e3b. Change-Id: Ic1aabcada892413f454c3800c925aa7527a09965 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* TerminalProcess: Fix stopping the terminalJarek Kobus2022-10-312-18/+18
| | | | | | | | | | | | | | | | Fixes 30 seconds freeze when stopping the terminal during debugging (when being interrupted on some breakpoint). Fixes also the freeze on closing the preferences dialog after opening the remote shell via "Open Remote Shell" and keeping it open. Fixes: QTCREATORBUG-28365 Change-Id: I15dfd9cba02d03e0ba65878c5285ea8cc96d8aad Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: David Schulz <david.schulz@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* McuSupport: Update test json filesDaniele Bortolotti2022-10-284-4/+21
| | | | | | | | | | Match recent changes in QUL repository. Change-Id: Ib00f829a5a866dfc1a76c581c71e1338b29c214d Reviewed-by: Sivert Krøvel <sivert.krovel@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Yasser Grimes <yasser.grimes@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* McuSupport: Store macros as part of McuSdkRepositoryYasser Grimes2022-10-288-24/+90
| | | | | | | | | | | | | | To support extending the macros and calling the McuTargetFactory::expandVariables function statically, the macros are added as part of the SdkRepository. This commit also adds helper functions to extend macros other than the ones created from the packages. Change-Id: Ie7d2a9ad626782eec18738bdd3472ffd202e7a36 Reviewed-by: Rainer Keller <Rainer.Keller@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* McuSupport: Fix version warningsSivert Krøvel2022-10-281-2/+3
| | | | | | | | | | | | | | | Packages without version detection should not get a version warning, even if the json contains a version list. With this change, a package without version detection will not get a status with invalid version. Additionally, in the case of failed version detection, it would be helpful for the user to list the acceptable versions. The status text was updated to list these. Change-Id: I814a86c741d573732072206ef1e969790f175e6a Reviewed-by: Yasser Grimes <yasser.grimes@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Update qbs submodule to HEAD of 1.24 branchChristian Kandeler2022-10-281-0/+0
| | | | | | | Change-Id: I3a991428981c95abd92a7e95f70aac5d3f008b7a Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* McuSupport: Inform only after actual kit creationDaniele Bortolotti2022-10-282-6/+9
| | | | | | | | | | | Previously, a message about successful kit creation was printed for every kit without verification. So move the print to the actual kit creation function. Issue also reported in QTCREATORBUG-28281 Change-Id: I0e2cb463188210164a3582e7fa465a4ebb79b812 Reviewed-by: Sivert Krøvel <sivert.krovel@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* McuSupport: Fix version detection for GHS toolchainsDaniele Bortolotti2022-10-271-4/+4
| | | | | | | | | | The GHS compiler invoked without a valid input source file returns an error code. Use gversion instead, a utility part of the toolchain, with -help to retrieve the version string. Change-Id: I289f462d322db045368cfb5a02b6644838559639 Reviewed-by: Sivert Krøvel <sivert.krovel@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* McuSupport: Only store valid paths to settingsSivert Krøvel2022-10-271-1/+22
| | | | | | | | | | | | | | | | | | The plugin currently requires valid packages before updating kits. Invalid packages are ignored. This change makes writing to settings consistent with this approach. If any of the given paths are invalid, changes are not applied. In order to not accidentally include changes made to packages for other targets than the one visible in the UI, the Apply-button in the Devices page now only stores the current target. This also avoids unpredictable behavior when more than one target in the repo track the same dependencies. The path shown in the UI is the one which is applied, not a hidden path currently stored in another target. Change-Id: Id0a6ec1aebd53357d0ee2fb68f14529f34ae887f Reviewed-by: Daniele Bortolotti <daniele.bortolotti@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* McuSupport: Fix error in McuPackage validity checkSivert Krøvel2022-10-271-1/+2
| | | | | | | | | | | | | The recently added McuPackage::Status::ValidPackageVersionNotDeteced is supposed to be a valid status for an McuPackage, similar to ValidPackageMismatchedVersion. It produces a warning symbol, but is not supposed to block kit creation. Task-number: QTCREATORBUG-28246 Change-Id: Ifdc8488d28019ec76d29114501876c6d7d5e700c Reviewed-by: Rainer Keller <Rainer.Keller@qt.io> Reviewed-by: Daniele Bortolotti <daniele.bortolotti@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* McuSupport: Add missing settings keysSivert Krøvel2022-10-2712-1/+20
| | | | | | | | | | | | | | | | The JSON entry "setting" contains the key under which the path to a dependency is persistently stored by QtCreator. Some packages were missing this entry, and as such changes to their settings were not made permanent. This patch updates test jsons to match Qt for MCUs repo. Task-number: QTCREATORBUG-28246 Change-Id: Iaa3eaf28648e97e677a2dd3f1ab5580c18586ca2 Reviewed-by: Rainer Keller <Rainer.Keller@qt.io> Reviewed-by: Yasser Grimes <yasser.grimes@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* CMake: Fix settings display not updatedMarcus Tillmanns2022-10-272-0/+4
| | | | | | Fixes: QTCREATORBUG-28267 Change-Id: Icf2fb7e5d7a8cd44d7a61ade36be41106aba2138 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* Core: Hide Scrollbar highlightMarcus Tillmanns2022-10-271-0/+6
| | | | | | | | | | This patch hides the scrollbar overlay when the Scrollbar itself gets hidden, for example on mac for documents that fit into the viewport. Fixes: QTCREATORBUG-28336 Change-Id: I2cb61affe38d0066a3d6f3ca012f97674b3d1539 Reviewed-by: David Schulz <david.schulz@qt.io>
* Git: Fix focus issue in LogChangeWidgetOrgad Shaneh2022-10-271-7/+6
| | | | | | | | Workaround QTBUG-89156. Change-Id: Ia128db1c0c2ee85985b6a725b6cb849d87844668 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: André Hartmann <aha_1980@gmx.de>
* Texteditor: Fix text with underline black backgroundMarcus Tillmanns2022-10-271-3/+0
| | | | | | | | | | | If text was given an underline and the background was unset, it was drawn with a black background. This had been implemented for QTCREATORBUG-18101. Removing that patch does not seem to re-introduce that bug. Fixes: QTCREATORBUG-19191 Change-Id: Iaad05abbc7c673d233601ef72d1641e2edc530c5 Reviewed-by: David Schulz <david.schulz@qt.io>
* McuSupport: Remove MSVC2017 from supported toolchainsDaniele Bortolotti2022-10-271-3/+1
| | | | | | | | | According to our documentation we support MSVC2019 (16.0) https://doc-snapshots.qt.io/qtformcus-dev/qtul-msvc-compiler.html Change-Id: I45fd8cda40f1775be3c575e5b4ac55c3a714c4fe Reviewed-by: Rainer Keller <Rainer.Keller@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* McuSupport: Fix MSVC toolchain in legacy modeDaniele Bortolotti2022-10-271-1/+1
| | | | | | | | | | | | Wrong executable argument for version detector was not allowing for Desktop MSVC kit creation in legacy mode. Task-number: UL-6597 Change-Id: If64472002e3aace6240c91cf9c303a2f01febe50 Reviewed-by: Rainer Keller <Rainer.Keller@qt.io> Reviewed-by: Yasser Grimes <yasser.grimes@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* AutoTest: Fix crashChristian Stenger2022-10-271-7/+0
| | | | | | | | | Remove the unneeded stunt when clearing cache which only led to crashes. Fixes: QTCREATORBUG-28269 Change-Id: I908bcbee0f49369a589862cd8fbd3253444246c3 Reviewed-by: David Schulz <david.schulz@qt.io>
* Utils: Fix inconsistent debug outputMarcus Tillmanns2022-10-271-2/+4
| | | | | Change-Id: Iccfae5e70e4f0992cbf16e05688547e54c637a27 Reviewed-by: David Schulz <david.schulz@qt.io>
* Utils: Workaround for slow data uploadMarcus Tillmanns2022-10-271-2/+8
| | | | | | | | | The deviceshell script is slow to upload large amounts of stdin data. Use QtcProcess directly if the size of the data exceeds 100kb. Change-Id: Ide63bfd973d31f7f076ab7cd4be73cc85c9239ea Reviewed-by: David Schulz <david.schulz@qt.io>
* VCS: Remove export for inline functionsOrgad Shaneh2022-10-271-4/+4
| | | | | | | | | vcsenums.h:29:28: warning: inline function 'void VcsBase::operator|=(VcsBase::RunFlags&, VcsBase::RunFlags)' declared as dllimport: attribute ignored [-Wattributes] 29 | inline void VCSBASE_EXPORT operator|=(RunFlags &p, RunFlags r) | ^~~~~~~~ Change-Id: I0490965260302009bb49ed1c4be994496cbe186f Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Cppcheck: Do not start non-existing toolChristian Stenger2022-10-271-1/+1
| | | | | | | | Just pollutes the General Messages pane, so skip execution if tool is not existing. Change-Id: Ib78e3a8ccd992ff2d58f183102c778c800156b89 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Editor: fix FontSettings::lineSpacing for zoomed fontsDavid Schulz2022-10-272-16/+7
| | | | | | Change-Id: Ia7ad3a877c56fb9cd962592b6d3e967beb9002dc Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* VCS: Fix resolving active directory for temp editorsOrgad Shaneh2022-10-261-1/+1
| | | | | | | Amends c666c938822dbdd7f74bc44a6b31bee171ee5c63. Change-Id: Ib7aeb9616d3d527f829ece2a39eb5ddf77f9431e Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* QbsProjectManager: Fix displayed build variant in build stepChristian Kandeler2022-10-262-18/+13
| | | | | | | | The initialization was lost in 2ecfda056bf283cc57132481e4fa11642a02491f. Change-Id: I40db0ea26de74aa6420ecc50c473bbcb22891238 Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Editor: Fix painting highlights on scrollbarDavid Schulz2022-10-261-1/+1
| | | | | | | | | | | The document layout rounds up the height of lines in QTextLayout::boundingRect, so we have to do the same for calculating the position of highlights on the scrollbar. Fixes: QTCREATORBUG-28299 Change-Id: I36496ebec7fe7861feff7cb8a2647a11ee078b8f Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* QMake: Remove unnecessary build dir changedMarcus Tillmanns2022-10-263-1/+4
| | | | | | | | | | | | | Previously every time a qmake project was built, the "buildDirectoryChanged()" was emitted, leading to a complete reparse of the project file, tests, qml files and qml imports. To keep "QmakeBuildConfiguration::updateProblemLabel" be called, we re-introduce the "buildDirectoryInitialized" signal. Task-number: QTCREATORBUG-27785 Change-Id: I32d881eacb8cf26050c33da643c74c2cab4dc22d Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Autotest: Don't parse tests without filesMarcus Tillmanns2022-10-261-0/+4
| | | | | | | | | | | Previously the "Scan for tests" dialog would pop up momentarily during project loading, even though no files were loaded yet. Partial fix for: QTCREATORBUG-27785 Change-Id: I4087ba23d00a628465dd1532a725d9bcc37dec30 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* McuSupport: The armgcc version string does not contain 'v'Rainer Keller2022-10-2614-15/+15
| | | | | | Change-Id: Ic259bed17a97bccb64f427ce2054efc9d05b55f2 Reviewed-by: Dawid Śliwa <dawid.sliwa@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* McuSupport: Fix crash when there is no proper desktop toolchainKwangsub Kim2022-10-261-4/+14
| | | | | | | | | | | Desktop toolchain is picked up from the registered toolchains in Qt Creator, but it can be failed, for instance when there is no toolchain for MinGW, and it causes crash for now. An error handling is added to avoid it and inform to a user. Task-number: QTCREATORBUG-28296 Change-Id: Ie16cd6c75df9be510bb49b765ad61ddf189a41db Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Help: SquishTests: Updates for tst_WELP01Robert Löhning2022-10-261-0/+2
| | | | | | Change-Id: I2e25f8c3368c4c00c13827f5eb70d9e3a4fc5a9e Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* ClangFormat: Fix wrong comment indentationArtem Sokolovskii2022-10-263-2/+23
| | | | | | | Fixes: QTCREATORBUG-25539 Change-Id: Ifecc4bc2c0984319d858720d5bcd1788a9008e90 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* McuSupport: Specify MSVC type for toolchain pick upv9.0.0-beta2Kwangsub Kim2022-10-261-0/+1
| | | | | | | | | | | | The current criteria allows to select LLVM so that it can cause an unexpected behavior. Explicit toolchain type check will prevent the invalid toolchain setup. Change-Id: Ib0afa4304650dd451c12d7a8d950b26115661862 Reviewed-by: Yasser Grimes <yasser.grimes@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Daniele Bortolotti <daniele.bortolotti@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* CMakePM: Proper handling of relative toolchain files in CMakePresetsCristian Adam2022-10-251-3/+5
| | | | | | | | Previously it was only tested with absolute paths. Change-Id: I3871da60f3f1b17ae4d2d4cfb69d1be60da1435b Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMakePM: Use Utils::Environment for Presets environmentCristian Adam2022-10-253-28/+34
| | | | | | | | | Utils::Environment takes care of the case insesitivity of the key of environment variables on Windows. Change-Id: I624340d30c6b170b5d0a86791f26a4841a0b2fb7 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMakePM: Expand cache variables for the preset probeCristian Adam2022-10-251-7/+15
| | | | | | | | | This way the CMAKE_PREFIX_PATH set to $env{HOME}/Qt (Linux) or $env{SystemDrive}/Qt (Windows) would work as expected. Change-Id: I03a9102d6d1da2a8740cab738577c47c44166c6c Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* CMakePM: Accept broken kits for CMakePresetsCristian Adam2022-10-251-9/+11
| | | | | | | | | | | | For CMakePresets if a preset is broken we should not create a preset kit for every build type. Instead reuse the broken kit created by the first build type. Task-number: QTCREATORBUG-28295 Change-Id: I038fbb23817834f59ac73ccd2f9953f1a412b656 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* CMakePM: Allow presets without generator specifiedCristian Adam2022-10-251-0/+34
| | | | | | | | | | | | This allows presets that do not have a generator specified to proper work. On Windows CMake will detect "Visual Studio" as generator. This change sets the generator and the architecture values accordingly. Change-Id: I943e082430445c4b16cf9eaf4ae5ae2500b2bd2b Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* CMakePM: Merge cacheVariables, environment for inherited presetsCristian Adam2022-10-251-0/+44
| | | | | | | | | | cacheVariables, environment (and others) collection fields need to be merged when having inherited presets. Fixes: QTCREATORBUG-28360 Change-Id: I3d2b84355fad9ffa2dc4629ece7d42f7b482a859 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Editor: Fix find usage position in context menuDavid Schulz2022-10-251-2/+5
| | | | | | | | Do not add the find usage action to an editor context menu if it is already there. Change-Id: I0a98d81ae0e08be69ca2579af5701b5fbc8ccbda Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Utils: Fix copyFile to include permissionsMarcus Tillmanns2022-10-252-3/+12
| | | | | | | Also adds line breaks to info output. Change-Id: I314ab87a47d7bd7541acb6a1553238fcfc27099d Reviewed-by: David Schulz <david.schulz@qt.io>
* Debugger: Fix crash on start debuggingMarcus Tillmanns2022-10-251-2/+4
| | | | | | Change-Id: Iff517a977f85bd4ac6e1fdac502797f2455ae6f6 Reviewed-by: David Schulz <david.schulz@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* PE: Do not use setVisible() before having a parentChristian Stenger2022-10-251-2/+3
| | | | | | | | Fixes shortly popping up floating widget on the Build & Run settings page. Change-Id: I8bcc887ae73b9cb27f690548d0e98038fb757674 Reviewed-by: David Schulz <david.schulz@qt.io>
* ClangCodeModel: Re-enable renaming via clangdChristian Kandeler2022-10-241-7/+9
| | | | | | | | | | | The hard rename limit is gone, see https://reviews.llvm.org/D136454. Make the feature opt-in for now, as we still need to do some UI fine- tuning Change-Id: Ic631a5b39711c6f37fffeeec4d2a5f5bf3bde92b 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>
* McuSupport: Improve version detector logicDaniele Bortolotti2022-10-247-24/+14
| | | | | | | | | | | | | | | | | | | | | McuPackageDirectoryVersionDetector class name was misleading, McuPackageDirectoryEntriesVersionDetector better describes its purpose as it can be used to search for a regex match among the entries in packagePath filtered by filePattern. Also, remove isFile boolean member variable since is not needed for current use cases, ie Renesas Graphics library (RGL), and filePattern can be used instead. Also, improve version detector creation logic. If no filePattern is present in the Json kit file, the regex match is based on packagePath only, which is the correct way to detect the version for RGL. Task-number: UL-6642 Change-Id: I3ee2fdb623bdd77aea60f9eae3672b9b5aa40433 Reviewed-by: Rainer Keller <Rainer.Keller@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* McuSupport: Evaluate macros in paths when applying settingsRainer Keller2022-10-241-0/+2
| | | | | | | | | | | A macro entered by a user was not evaluated. Only the initial strings where expanded when the targets are created on first start. Task-number: UL-6697 Change-Id: I642bb4bc41e116cd0fe7f002da3d7f3cb301e62d Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Yasser Grimes <yasser.grimes@qt.io> Reviewed-by: Rainer Keller <Rainer.Keller@qt.io>
* McuSupport: Use signals to propagate path changes from McuPackagesRainer Keller2022-10-241-9/+10
| | | | | | | | | Instead of calling the update function manually unconditionally it will be called through a connection. Change-Id: Ibfd3efd0fbaa66c4857d8a15c202472e1f00f576 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Rainer Keller <Rainer.Keller@qt.io>
* McuSupport: Fix invalid version detector being instantiatiedRainer Keller2022-10-243-1/+74
| | | | | | | | | | | | | In case the JSON entry was missing completely, a directory version detector was instantiated. Instantiate version dectectors only if there is enough and valid information available. Change-Id: Iaf9cd40165e4d75124f3e0ddda66db2f4dab5ff7 Reviewed-by: Daniele Bortolotti <daniele.bortolotti@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Yasser Grimes <yasser.grimes@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* McuSupport: Fix invalid regular expression is considered validRainer Keller2022-10-242-7/+20
| | | | | | | | | | If a match was empty it was the same case as if no regular expression was set. Adding a new case that is triggered when there is a version detector but it returns an empty version string. Change-Id: I26c2f803b2c6a95b85d6b781085bfa9cd4b51975 Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* McuSupport: Use PROGRAMFILES environment variableRainer Keller2022-10-2414-14/+14
| | | | | | | | | | | | | The path was generated using the environment variable PROGRAMSANDFILES, while only PROGRAMFILES is defined. Task-number: UL-6618 Change-Id: I5ebff81d39a437586af905f56099c17c1afc1bd0 Reviewed-by: Daniele Bortolotti <daniele.bortolotti@qt.io> Reviewed-by: Yasser Grimes <yasser.grimes@qt.io> Reviewed-by: Dawid Śliwa <dawid.sliwa@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
View Lorry Controller Status