aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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-253-5/+9
| | | | | | | | 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-254-30/+36
| | | | | | | | | 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-252-10/+18
| | | | | | | | | 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>
* Squish-Tests: Use QTC_DO_NOT_PROPAGATE_LD_PRELOADRobert Löhning2022-10-2412-0/+12
| | | | | | | | | | | This is a reaction to an change in Creator's handling of environment variables. Creator now passes on LD_PRELOAD set by Squish. This results in build errors and crashes of started applications. Change-Id: I39cf21c60a474d7453e9c29fd3eaf32d3f0d6806 Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* Doc: Describe Configuration field in CMake build settingsLeena Miettinen2022-10-243-0/+4
| | | | | | | | Update screenshots. Task-number: QTCREATORBUG-27876 Change-Id: Ib0424bef44ac29078a86445da5032011ffc7ff94 Reviewed-by: Cristian Adam <cristian.adam@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>
* McuSupport: Fix crashRainer Keller2022-10-241-1/+1
| | | | | | | | | | The function updateStatusUi is modifying children of the main widget. In case the package changes when the MCU dialog is not present anymore it tries to access invalid widget pointers. Change-Id: I9127114caf03b4ea047b075e875f20bb3e0c02b4 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* McuSupport: Provide static function for external useRainer Keller2022-10-242-1/+2
| | | | | | | Make the static function public to be used by other classes as well. Change-Id: Ifc9e423cba04557d83696446c11df7cd16a421ab Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* McuSupport: Avoid accessing invalid pointerRainer Keller2022-10-241-1/+1
| | | | | | | | | | After the options dialog has been closed, all widgets are deleted but the m_fileChooser will not be set to nullptr again. Avoiding to use the widgets for data based accesses. Change-Id: I5d99fc4a34ecd9d22e26854c6956e9c0116de94b Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* ClangCodeModel: Adapt to new highlighting modifier in clangdChristian Kandeler2022-10-241-4/+3
| | | | | | | | | See https://reviews.llvm.org/D134728. Change-Id: I2bcfb09736b6eabc54cd986b0c096c8fa5869b8e 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>
* SquishTests: Update tst_create_proj_wizardRobert Löhning2022-10-242-2/+2
| | | | | Change-Id: I652f2504d1e13ae8c93429a99d31d3754bd57298 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* SessionDialog: SquishTests: Update tst_session_handlingRobert Löhning2022-10-243-2/+6
| | | | | | Change-Id: I6fcdb6173c39715e85f4cf37d12e7707b2e5d066 Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* Doc: Use "which" in clauses that add supporting informationLeena Miettinen2022-10-241-2/+2
| | | | | | Fixes: QTCREATORBUG-28364 Change-Id: I98bbff1886fc63d024dd9ce57720274b598bf6de Reviewed-by: David Schulz <david.schulz@qt.io>
* Python: fix PySide project tool detectionDavid Schulz2022-10-241-34/+39
| | | | | | | The tool moved to the PySide6-Essentials module. Change-Id: I204d2025bc51b6c5cffe82cba66878d077f03b72 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* PE: Use original vcvarsall.bat to do environment cleanupCristian Adam2022-10-241-12/+10
| | | | | | | | | | | Amends ae07c31976045a859c5216ebc4866a17d2ae1f91 Calling a VS2022 vcvarsall.bat /clean_env in a VS2019 environment causes failures. Using the original vcvarsall.bat does the proper cleanup. Change-Id: I12426e9eb97baecae5357e6bb419333464ea1ded Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: David Schulz <david.schulz@qt.io>
* Qt Quick Designer: Fix references to changed view names in UI textLeena Miettinen2022-10-246-10/+10
| | | | | | | | | | | - Form Editor > 2D - 3D Editor > 3D - Text Editor > Code Task-number: QTCREATORBUG-28334 Change-Id: I65f693b47b1c361dae3c270333ff036e4c473b9e Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* ProjectExplorer: Allow selection of remote build directoriesMarcus Tillmanns2022-10-242-1/+28
| | | | | | | Change-Id: Ieaf0b01bde6d043782d6d9d4bb745c090c6087c1 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: hjk <hjk@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* SquishTests: Update "Save before build"- checkboxRobert Löhning2022-10-241-1/+2
| | | | | | | | Fixes tst_save_before_build Change-Id: I7af2c215dcb55796498875d1ed62783f37edb664 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* SquishTests: Update SaveItemsDialog and ReadOnlyFilesDialogRobert Löhning2022-10-242-9/+8
| | | | | | | | Fixes tst_modify_readonly Change-Id: I1ba81af321a8ca3d5498d68e2d85abd1214546b9 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* McuSupport: Add handling of os-specific validation pathsSivert Krøvel2022-10-2434-96/+287
| | | | | | | | | | | | | | | | | | | Before the refactoring, the various third party packages had detection paths set to facilitate picking the correct subdirectory in QtCreator. Adding these paths to the JSONs prompts hints in the Devices>MCU UI to which path to enter, and prevents the user from picking the wrong path Since the paths might vary based on the host-os, it is necessary to enable parsing this from JSONs, similar to how the "defaultValue" is handled. The "detectionPath" entry can either be an object with separate values in fields named "windows" and "linux", or a string. Change-Id: I813affe856fe73f6cf34ea75850500b49a1b2b6a Reviewed-by: Rainer Keller <Rainer.Keller@qt.io> Reviewed-by: Kwangsub Kim <kwangsub.kim@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Yasser Grimes <yasser.grimes@qt.io>
* DiffEditor: Persist description widget heightOrgad Shaneh2022-10-242-2/+15
| | | | | | Fixes: QTCREATORBUG-24286 Change-Id: Ie1bf1136bce973b7197b7378b48a85ec776e8f6d Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* UnifiedDiffEditor: Fix visible wrap columnJarek Kobus2022-10-241-1/+1
| | | | | | | | | | Take m_visibleIndentOffset into account when drawing right margin. Fixes: QTCREATORBUG-26601 Change-Id: I50839098953181c667a5fe0e5fac7dfa5bc95327 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: David Schulz <david.schulz@qt.io>
* McuSupport: Give a reason for the toolchain being declared unsupportedRainer Keller2022-10-242-9/+34
| | | | | Change-Id: I95eb399cbaa199b442ce0d9596477a039dce4f30 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* McuSupport: Store the source location of the JSON fileRainer Keller2022-10-244-9/+9
| | | | | | | | This allows to mention the file name the configuration was created from in error messages. Change-Id: Id8e3d4a754cf5c1f0a12c6b21af1158713c68690 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Core: Allow "Remove Folder" in File System View paneCristian Adam2022-10-222-10/+13
| | | | | | | | | | | | | | | As a CMake user from time to time I have the need to simply remove a build directory. This is now possible from the File System pane. Previously one had to open a Terminal an do there a "rm -rf" or "rmdir /q /s" operation. The user will be asked before, and there is no possibility of a misclick and remove something the user didn't consent to. Fixes: QTCREATORBUG-27331 Change-Id: I61aa42ce6587e46d635d9743b154f2bc9d163b1e Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Android: Fix connecting to debug server using adb over WiFiAdam Sowa2022-10-211-1/+8
| | | | | | | | Remove port number from ADB's device serial number when setting remote channel for debugging. Fixes: QTCREATORBUG-28342 Change-Id: I8b979af38aea5167693cb319a0a18490963b115a Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Translations: Get some translations for Text Editor settings backEike Ziller2022-10-2116-49/+49
| | | | | | | | Display, font and tab settings. No idea when that broke, but it is trivial to get back. Change-Id: I96b809cb40c899bb62ddeaab03343181826930a8 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* CMakePM: Add installDir CMakePresets supportCristian Adam2022-10-216-0/+53
| | | | | | | | | Is part of CMakePrests v3, and slipped at the implementation time. Task-number: QTCREATORBUG-24555 Change-Id: Id3ce90c0a979d44287fc03ae1dd49a64e964cdf2 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* CMakePM: Use parent environment for $env{macro} expansionCristian Adam2022-10-212-10/+29
| | | | | | | | | | Now the code takes into consideration the parent environment for $env{macro} alongside the "environment" presets values. Task-number: QTCREATORBUG-24555 Change-Id: I644618b0a6f866fd65a4109ee63b1f5bfcd4164d Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* TextEditor: Fix wrong space in behavior settingsEike Ziller2022-10-2112-12/+12
| | | | | | | German translation done separately Change-Id: I746ab8455109d83ca69c0add0a8d9e34555bea18 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* McuSupport: Prevent multiple packages writing to the same keyRainer Keller2022-10-211-0/+6
| | | | | | | | | | | Writing with an empty settings key will result in multiple packages writing their value in the same key "Package_", with the suffix missing, overwriting each other. Change-Id: Iee3e042a2d9d5d1f4e34b903360129ba25b6f6ea Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Yasser Grimes <yasser.grimes@qt.io> Reviewed-by: hjk <hjk@qt.io>
* Editor: fix extra area width updateDavid Schulz2022-10-211-2/+1
| | | | | | | | | Do not missinterpret the new block count after a document change as the requested extra area width. Fixes: QTCREATORBUG-27267 Change-Id: Id724f68d223741bc36e4566e51e5d1d051f6cca3 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Merge "Merge remote-tracking branch 'origin/8.0' into 9.0" into 9.0The Qt Project2022-10-213-2/+30
|\
| * Merge remote-tracking branch 'origin/8.0' into 9.0Eike Ziller2022-10-213-2/+30
| |\ | | | | | | | | | Change-Id: Icd606068e77d6845cbbda5d48eda477cb21a312f
| | * QmlDesigner: Allow drag-n-drop a bundle material to materials sectionMahmoud Badri2022-10-203-2/+30
| | | | | | | | | | | | | | | | | | Fixes: QDS-8041 Change-Id: I848f636f41c58e11c719517f4073243a76e293b6 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| | * ClangFormat: Fix compilation with LLVM 15Robert Löhning2022-10-201-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7990e8331c317d3bc363be610b2585d37dee4445 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> (cherry picked from commit a1bfcbf30d493e1e1fab94851fe50fed81cd3d6e) Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Eike Ziller <eike.ziller@qt.io>