aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Git: Branch View: Refresh after Create BranchHEADmasterAndre Hartmann31 hours1-0/+2
| | | | | | | | | | ... from change context menu, but without checking out the new branch. Fixes: QTCREATORBUG-33846 Change-Id: Ifdc7c949951d20ccc3a79e8e6ee4ad9308cbf695 Reviewed-by: Robert Löhning <robert.loehning@qt.io> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Git: BranchView: Allow cherry-picking a list of commitsAndre Hartmann2 days10-24/+94
| | | | | | | | ... instead only the top commit of the selected branch. Change-Id: I42cb6e682afd239ee374f475215e580288b5a681 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: André Hartmann <aha_1980@gmx.de>
* CMakeProjectManager: Respect device search paths settingsChristian Kandeler2 days6-18/+36
| | | | | | | ... when handling a tool detection request. Change-Id: Id899a7705afcaa27f3c3c679920aa1e2f89a9bea Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* ProjectExplorer: Include search paths in IDevice::toolDetectionRequestedChristian Kandeler2 days6-10/+17
| | | | | | | So that receivers have a chance to respect that setting. Change-Id: I36c17d923b62b04422cb747d0e1e9f53329379bb Reviewed-by: hjk <hjk@qt.io>
* Doc: Describe new Terminal optionsLeena Miettinen2 days10-96/+50
| | | | | | | | | | | | | - Turn the topic into a how-to topic - Remove descriptions of preferences that have tooltips or are otherwise intuitive to use - Describe inserting macro variables - Describe running qtc commands from the terminal - Add section titles Task-number: QTCREATORBUG-33693 Change-Id: I0b6c4735094e372244241d68c49a1d971492fc89 Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
* QtSupport: Enable the "Link with Qt" button only for the Desktop deviceChristian Kandeler3 days1-24/+22
| | | | | | | The associated functionality is not supported for devices. Change-Id: Ic7cc977fdf3494590cf9ddae3e03cc09d574fe92 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Core: Disentangle settings dialog helper classes a bithjk3 days1-5/+5
| | | | | Change-Id: I622536c4d94111bb3547b4cffa70dc701db79c56 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Python: Move interpreter access from option page to option page widgethjk3 days3-146/+141
| | | | | Change-Id: I70f893911e4ffae0485dda80ecea951f3ca7be33 Reviewed-by: David Schulz <david.schulz@qt.io>
* Debugger: Fix connection to gdbserver if using ssh port forwardinghjk3 days1-0/+4
| | | | | | | | | ... when gdb runs under docker. Done-by: Dilshod Mukhtarov Fixes: QTCREATORBUG-33620 Change-Id: I93d37ab0902758e452604915e3d197e4a7194318 Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
* Valgrind: Display more issuesChristian Stenger3 days1-0/+10
| | | | | | | | We handled them, but filtered them out for the display. Let the user decide whether to display them or not. Change-Id: If6d8f9100058e881ebf3743297d97aeb078cc5e6 Reviewed-by: hjk <hjk@qt.io>
* Improve usability of version dialog on WindowsChristian Stenger3 days1-3/+19
| | | | | Change-Id: I9cbc8951872305f09388a15915645a7801f70e57 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Include more and machine readable information with -versionEike Ziller3 days1-3/+11
| | | | | | | | | Add revision and date if applicable, print version info in more structured way. Fixes: QTCREATORBUG-33725 Change-Id: I76093d1663dc98d34e95d88666580b552b3fb3db Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* BridgedFileAccess: Fix translatable stringsEike Ziller3 days1-60/+80
| | | | | | | | | | | | | | Get rid of function for printing message with (potential) file path and exception string, that did some wrong assumptions about placeholders and did UI string arithmetics. Introduce a few simpler helpers instead and use these. Adds missing Tr::tr, missing quotes around file names, and generally cleans up a bit. Change-Id: Id1882e3c9d2ed6396da3cd0b8b95768a1c9b9e0b Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
* Devcontainer: Show config files in project treeMarcus Tillmanns3 days1-1/+113
| | | | | | Change-Id: I3860823b7663580f19a0f2d7ffc8ad6a5c1ce614 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* CompilationDatabasePM: Make more device-awareChristian Kandeler3 days1-31/+35
| | | | | | Task-number: QTCREATORBUG-33739 Change-Id: Ifd6e6b32567aca9f609ebf647e755c469e2ba6cc Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Coco: Simplify settings page setuphjk3 days1-68/+30
| | | | | Change-Id: I1d4abea81b9b7dd97e28df17bc706b92af359870 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Core: Fix settings applyChristian Stenger3 days1-1/+1
| | | | | | | Amends 6b6ad7f36d96440a0a6b3cbb22131526ff07d7f9. Change-Id: I000e40be895a780b1a0f759d48cf4fd4860dbc47 Reviewed-by: hjk <hjk@qt.io>
* Doc: Fix a \uicontrol QDoc commandLeena Miettinen3 days1-1/+1
| | | | | Change-Id: Iee9589db35f83a30640c71e74b04a4ca8c370f9d Reviewed-by: Teea Põldsam <teea.poldsam@qt.io>
* Valgrind: Update xml protocol handlingChristian Stenger3 days4-3/+49
| | | | | | | | We now support protocol versions from 4 to 6. Fixes: QTCREATORBUG-33759 Change-Id: I5c2666be5913dcd5efa91ec158abc0fed2f00a37 Reviewed-by: hjk <hjk@qt.io>
* CMakePM: Refactor CMakeProgressParserCristian Adam3 days1-24/+36
| | | | | | | | | | ... to only match progress according to the CMake generator. This removes useless Makefiles progress matching when using the Ninja generator. Change-Id: I72f4ff31eab8bbc2c3cc89f751297c41239ef8e5 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* CMakePM: Do not build `all` for a staging single targetCristian Adam3 days2-3/+58
| | | | | | | | | | | | | | | | When staging is used Qt Creator will add the "install" command to the CMake building command line. The "install" command has a dependency on the "all" target which would mean that the whole project will be built instead of the just one target that we selected. This patchset makes sure that for Ninja and Makefile generators the "sub/ dir/target/all" and "sub/dir/target/install" targets are build. Fixes: QTCREATORBUG-33580 Change-Id: Ia53ab48ac9e604d576992e3e386c76f5059aa150 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* qbs build: Re-enable the ability to configure CMake projectsChristian Kandeler3 days2-0/+14
| | | | | | | Amends 60aa562ef02c8b7929f339bb6cba810b1703a02b. Change-Id: Ie50be49f39b123023aec7474e92dc07b44093d30 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* Core: Refresh Settings mode UIAlessandro Portale3 days1-24/+48
| | | | | | | | | | | | | Having been promoted to a mainwindow filling mode, the settings have now have more space and could be allowed to "loosen up" a bit like other modes do. - Adapt margins and spacings to those of "designed" modes - Use LayoutBulder - Use QDialogButtonBox for Apply/Cancel Change-Id: I4c6564c9c158ca614683ade97556900eb7b7acf7 Reviewed-by: hjk <hjk@qt.io>
* CppEditor: Fix compiler flag in CompilerOptionsBuilderJoker Principal4 days1-0/+4
| | | | | | | | | clang-cl consider "/clang:-std=..." as language version flag, currently we check only for "-std:..." to detect language version flag, so remove prefix "/clang:" and "-clang:" before checking. Change-Id: I4fd59ef06abe9de980c6c4fda84766470207cc18 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* ExtensionManager: Reduce customOsTypeToString to OsTypeMacAlessandro Portale4 days1-8/+1
| | | | | | | OsTypeMac "macOS" is the only deviating one. Change-Id: I35fc3c6f2c19926592300874ac10793b4a67cd84 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* CppEditor: Merge AbstractEditorSupport and GeneratedCodeModelSupporthjk4 days12-119/+84
| | | | | | | | | ... and rename to GeneratedFileSupport. No need for this abstraction. Also, remove Q_OBJECT. Change-Id: Ib2cc6997c3eccf589558a19a9b243a5d3c620abd Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Merge "Merge remote-tracking branch 'origin/18.0'"The Qt Project4 days13-30/+190
|\
| * Merge remote-tracking branch 'origin/18.0'Eike Ziller4 days13-30/+190
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/utils/osspecificaspects.h src/plugins/boot2qt/device-detection/devicedetector.cpp Change-Id: Iabca733436cf7b7be9cf366b2b05710fc1ab206b
| | * QmlDesigner: Fix id resolving for Qt 6.10.1v18.0.1Alessandro Portale6 days1-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switching from Qt 6.10.0 to 6.10.1 introduced this qml runtime error > Invalid alias target location: gradientPropertyName That prevented the QmlEditor PropertyEditor from being displayed. Removing the "root." fixes the issue. Change-Id: I80d0af4bfff0f8e0ed0c61fde0f6f2808c34e5cd Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| | * Utils: Use QMovie if Qt version allows itMarcus Tillmanns6 days2-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-131448 Change-Id: I5dc93965833689509f57f8f16fc906b58d9ebb10 Reviewed-by: Eike Ziller <eike.ziller@qt.io> (cherry picked from commit e73cc84f43927b35d101202fef115dce14ded599) Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io> Reviewed-by: Marco Bubke <marco.bubke@qt.io>
| | * CompilationDatabaseProjectManager: More fixes for remote projectsChristian Kandeler6 days2-10/+5
| | | | | | | | | | | | | | | | | | | | | | | | Amends d6cf21e0d3472924a8d05c3c95991a7a83e21f78. Fixes: QTCREATORBUG-33739 Change-Id: I7b291f7a5876c984c4e4a9ad5c069f0f4578d735 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| | * Boot2Qt: Do not re-add existing device in DeviceDetectorChristian Kandeler6 days1-13/+24
| | | | | | | | | | | | | | | | | | Fixes: QTCREATORBUG-33701 Change-Id: I600eda413b491621775c001f3132eaa0ee666093 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
| | * Utils: Consider case sensitivity when calculating relative pathsChristian Kandeler7 days2-3/+12
| | | | | | | | | | | | | | | | | | Task-number: QTCREATORBUG-33750 Change-Id: I1b8745d9459f9b26371cac6528018dc813d870a6 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| | * ProjectExplorer: Fix Kit removal not persistingChristian Kandeler7 days2-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1) KitNode::m_kit is the original kit on opening the settings page and never changes. 2) When creating a new kit in the settings page, a new KitNode is created with a null kit. 3) Upon applying the settings dialog, the new kit is registered with the KitManager and replaced in KitManagerConfigWidget with the registered version, while the one in KitNode stays at null. 4) From that point on, all accesses to KitNode::m_kit refer to outdated information. Therefore, if a widget is present, KitNode::kit() must not return its own stored pointer, but the potentially updated one from the widget. Fixes: QTCREATORBUG-33829 Change-Id: I07883af2a3097a550f884eaf40bfa7d542efbde0 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: hjk <hjk@qt.io>
| | * Make Coco plugin recognize Coco on macOS correctlyMarkus Redeker7 days1-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In contrast to Linux, the executables of Coco on macOS are not in a bin/ subdirectory but directly in /Applications/SquishCoco (or in another directory chosen at installation time). To verify that the user has selected a valid Coco directory, the plugin checks that it constains a coveragescanner executable; so until now, the plugin did not work on macOS. (For its highlighting functionality, the plugin also needs to find CoverageBrowser.) Fixes: QTCREATORBUG-33476 Change-Id: I3c115733282524c37444ad5d2604aa58e26d7138 Reviewed-by: David Schulz <david.schulz@qt.io> (cherry picked from commit 42c1ed62854f0eba2108c74beb46d72e8e3b1419) Reviewed-by: Markus Redeker <markus.redeker@qt.io>
| | * McuSupport: Update MSVC toolchain to 2022Sivert Krøvel9 days1-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt for MCUs 2.12 desktop platform libraries are built with MSVC 2022. Task-number: QTMCU-417 Change-Id: I6e52066eab96e14740cd146e4016b4f3fdd3f9e2 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Yasser Grimes <yasser.grimes@qt.io>
| | * Update qbs submodule to HEAD of 3.1 branchChristian Kandeler9 days1-0/+0
| | | | | | | | | | | | | | | Change-Id: I962bfc2af86944dee02a6a3ef3f4a878ad6d57a5 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| | * ProWriter: Add log messagesChristian Kandeler9 days1-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | ... to investigate mysterious failure to calculate relative paths. Task-number: QTCREATORBUG-33750 Change-Id: If358a488ee89a661ab32c8352f501da90d7b1b08 Reviewed-by: hjk <hjk@qt.io>
| | * CmdBridge: Add support for 32bit ARMMarcus Tillmanns10 days2-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTCREATORBUG-33699 Fixes: QTCREATORBUG-33836 Change-Id: Icffb000831f402b36120f8fe7e9c78f883fac917 Reviewed-by: Eike Ziller <eike.ziller@qt.io> (cherry picked from commit 5a91e9775949050f0545d60f88dac269f3da78d7)
| | * Add change log for 18.0.1Eike Ziller10 days2-0/+131
| | | | | | | | | | | | | | | Change-Id: I13a874cff09afa82161bfc657884006b3511f95c Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | | Fix that qmldesigner was loaded even though deprecatedEike Ziller4 days2-2/+3
|/ / | | | | | | | | | | | | | | | | | | | | Was loaded as a dependency of the multipropertyeditor plugin, which was turned on by default in the qds branch. Turn it off by default again and make it a "recommendation" for the qmldesigner plugin instead. Change-Id: Id754e87c85c4bd5f51a233630696dde6c8f8c7bb Reviewed-by: hjk <hjk@qt.io>
* | McuSupport: Fix unit testsChristian Stenger4 days1-1/+1
| | | | | | | | | | | | | | Amends d2a8198b0f71a0693ebc8666a3a06ff432db63ea. Change-Id: I50f650f200249fb3c9ae49c1ba06829e6a0508ee Reviewed-by: hjk <hjk@qt.io>
* | iOS: Fix finding app bundle with single-platform Qt buildsEike Ziller4 days1-33/+10
| | | | | | | | | | | | | | | | | | | | | | | | In multi-platform builds, CMake emits the "${EFFECTIVE_PLATFORM_NAME}" in the target artifact path, but in other cases it might not. But in these cases the artifact path is actually the correct one and we shouldn't try to construct the path ourselves with hardcoded platform paths that then are wrong. Change-Id: I0a48ce200a573cfbb70aa3b81dd3a5ab76be04d7 Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | QmlDesignerCore: Fix build with gcc 11.4.0Andre Hartmann4 days1-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-creator/src/plugins/qmldesigner/libs/designercore/projectstorage/projectstorageupdater.cpp:1065: error: ‘span’ is not a member of ‘std’ qt-creator/src/plugins/qmldesigner/libs/designercore/projectstorage/projectstorageupdater.cpp:1065:29: error: ‘span’ is not a member of ‘std’ 1065 | Result mergedSourceIds(std::span<SourceId> sourceIds1, std::span<SourceId> sourceIds2) | ^~~~ qt-creator/src/plugins/qmldesigner/libs/designercore/projectstorage/projectstorageupdater.cpp:1065:29: note: suggested alternatives: In file included from /home/andre/git/qt-creator/src/libs/utils/ span.h:31, from qt-creator/src/libs/sqlite/sqliteids.h:6, from qt-creator/src/plugins/qmldesigner/libs/designercore/include/sourcepathids.h:6, from qt-creator/src/plugins/qmldesigner/libs/designercore/include/projectstorageids.h:6, from qt-creator/src/plugins/qmldesigner/libs/designercore/projectstorage/filestatus.h:6, from qt-creator/src/plugins/qmldesigner/libs/designercore/projectstorage/projectstorageupdater.h:6, from qt-creator/src/plugins/qmldesigner/libs/designercore/projectstorage/projectstorageupdater.cpp:4: qt-creator/src/libs/3rdparty/span/span.hpp:572:7: note: ‘nonstd::span_lite::span’ 572 | class span; | ^~~~ qt-creator/src/libs/3rdparty/span/span.hpp:572:7: note: ‘nonstd::span_lite::span’ Change-Id: I1991a8b0fb028ac5faa2be9d82034c55cc0da87b Reviewed-by: hjk <hjk@qt.io>
* | ProjectExplorer: cash isvalid state like in the base implementationDavid Schulz4 days2-7/+20
| | | | | | | | | | | | | | | | Since ToolChain::isValid is called quite often saving this avoid a lot of fileOperation and therfore results in a bit faster startup. Change-Id: I422c81a6b443f406d1c27285994540c92eb6b424 Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
* | CppEditor: Move static functions out of AbstractEditorSupporthjk4 days5-18/+19
| | | | | | | | | | | | | | Less coupling. Change-Id: I44804c2926b40bfc91a390d7ccc152331836f02a Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | ProjectExplorer: Ensure key is present after Kit::setValue()Christian Kandeler4 days1-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | The QtProjectImporter test depends on that and is currently broken, because debuggers are detected asynchronously and we don't have the placeholder entries anymore. I believe the optimization not to enter invalid values into the map was accidental or at least not consistent, as we did not remove an existing key when setValue() was called with an invalid QVariant. Change-Id: I90c6c3843fbc52c6d157f1a0beaae7b65766e729 Reviewed-by: hjk <hjk@qt.io>
* | DiffEditor: Add action to (un)fold all blocksAndre Hartmann4 days4-0/+35
| | | | | | | | | | | | Fixes: QTCREATORBUG-33783 Change-Id: I953c615bf40b128cbab3331f0ee0bce9fd3ff788 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | Utils: Recognize QNX as "Other Unix" in osTypeFromStringhjk4 days1-1/+5
| | | | | | | | | | | | Task-number: QTCREATORBUG-33815 Change-Id: I650bb145873e9bcfb7d4b6dcb45ecc8564bdfbfa Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
* | CMakeProjectManager: Remove device tool aspect and placeholder toolsChristian Kandeler4 days7-79/+3
| | | | | | | | | | | | | | Not needed anymore, now that we have proper per-device detection. Change-Id: I4d68b97a24890d78e3c0e730b148458a6d3e5ec4 Reviewed-by: Cristian Adam <cristian.adam@qt.io>