aboutsummaryrefslogtreecommitdiffstats
path: root/share/qtcreator/qml/qmlpuppet/qml2puppet/instances
Commit message (Collapse)AuthorAgeFilesLines
* QmlDesigner: QmlPuppet as standalone toolMarco Bubke2022-11-0967-12357/+0
| | | | | | | | | | | | | The qmlpuppet is now a standalone tool. There is new a library too with the communication code. That is shared between the designer and the puppet. It's in a .cmake file so it can be included by the standalone tool if it is not part of a designer build. Task-number: QDS-5879 Change-Id: I2bc2a0b463fbb3e0c8c23d182abfd368cf87e968 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* QmlDesigner: Fix Q_ASSERTThomas Hartmann2022-10-201-1/+3
| | | | | | | | | instanceForObject(item) will assert if the instance does not exist. We already do check if the instance is actually valid. Change-Id: I0b0ef37d7db3d1e4195504ee8e5f92243bb26d83 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Port from qAsConst() to std::as_const()Marc Mutz2022-10-072-7/+7
| | | | | | | | | | | | | | We've been requiring C++17 since Qt 6.0, and our qAsConst use finally starts to bother us (QTBUG-99313), so time to port away from it now. Since qAsConst has exactly the same semantics as std::as_const (down to rvalue treatment, constexpr'ness and noexcept'ness), there's really nothing more to it than a global search-and-replace. Task-number: QTBUG-99313 Change-Id: I88edd91395849574436299b8badda21bb93bea39 Reviewed-by: hjk <hjk@qt.io>
* Merge remote-tracking branch 'origin/8.0' into 9.0Eike Ziller2022-09-2710-17/+55
|\ | | | | | | | | | | | | | | Conflicts: src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp src/plugins/qmldesigner/designercore/imagecache/meshimagecachecollector.cpp Change-Id: I38f196e8f42cf11f7b613e7a723745600e35c5e9
| * QmlDesigner: Fix anchor targetsThomas Hartmann2022-09-231-1/+13
| | | | | | | | | | | | | | | | | | | | In some cases the binding for anchor targets is not properly resolved. Using explicitly the root context we define the ids in does solve the issue. Change-Id: I69e5bd237668719ec9417d30d0bac8635c79506a Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
| * QmlDesigner: Create importComponentObject in root contextThomas Hartmann2022-09-231-1/+1
| | | | | | | | | | | | | | | | | | This might be the implicit default, but let's make this explicit. Change-Id: Ic42735b12f22819767ceb642d265f813201c9146 Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
| * QmlDesigner: Fix material 2D view preview for material root componentsMiikka Heikkinen2022-09-236-15/+21
| | | | | | | | | | | | Change-Id: I7930e5087014b47ccc054109cbb607ef9c373515 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
| * QmlDesigner: Remove unused variableMiikka Heikkinen2022-09-231-1/+0
| | | | | | | | | | Change-Id: Ifaddb79f01887d73cc2d715ba45f41f2dcd30a0a Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
| * QmlDesigner: Fix state shown after reorderingHenning Gruendl2022-09-222-0/+20
| | | | | | | | | | | | | | | | | | | | | | Fix an issue which caused the wrong state to be shown in the form editor after reordering the states in the state editor. Task-number: QDS-7753 Change-Id: I220bb5b11beb4f9bfc6a85069a688c9ff2984d8f Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* | Merge remote-tracking branch 'origin/8.0'Tim Jenssen2022-09-221-1/+7
|\| | | | | | | | | | | | | | | | | resolved conflicts: share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp src/plugins/qmldesigner/components/formeditor/formeditorview.cpp src/plugins/qmldesigner/designercore/exceptions/exception.cpp Change-Id: I13a5248415fa1ae03e1c6d0972d9b3bb8c80a3b0
| * Check for more dirty flagsKnud Dollereder2022-09-211-1/+7
| | | | | | | | | | | | | | | | | | | | This fixes an issue of the formeditor which did not update properly if components contain items that have one of zvalue, opacity or visibility attributes animated. Change-Id: I1b20f09177878419b2b18aaf94c84b6ae437be7d Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* | Merge remote-tracking branch 'origin/8.0'Eike Ziller2022-09-192-7/+20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditor.qml share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/icons.ttf src/libs/utils/fileutils.cpp src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp src/plugins/qmldesigner/designercore/include/abstractview.h src/plugins/qmldesigner/designercore/include/nodemetainfo.h src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp src/plugins/qmldesigner/designercore/model/model_p.h src/plugins/remotelinux/linuxdevice.cpp tests/auto/utils/fileutils/tst_fileutils.cpp Change-Id: I26a21e2523d3d725fdb8c548a531cdbdaeaeca20
| * QmlDesigner: Ignore "when" property for all statesThomas Hartmann2022-09-151-3/+1
| | | | | | | | | | | | | | | | | | We actually did set the "when" property for StateGroups. Change-Id: I45a1663d60f8f443b4deafa529d1fd2788a8459e Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
| * QmlDesigner: Create 3D models at the point of context menu triggerMiikka Heikkinen2022-09-131-4/+19
| | | | | | | | | | | | | | Fixes: QDS-7640 Change-Id: I2f178c2e2661dedc4efe23b675363283e3cd3bc3 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* | QmlDesigner: Break dependency to View3DActionCommandMarco Bubke2022-09-151-28/+30
| | | | | | | | | | | | | | | | | | | | | | The node instance view and his commands should be not called directly from other views. There are special classes QmlItem which can do it but every change should go through the model. Change-Id: I734e5538d7f6ecb07d736912f647c5eb92dc7631 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* | Merge remote-tracking branch 'origin/8.0'Eike Ziller2022-09-132-11/+23
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: .github/workflows/build_cmake.yml src/plugins/qmldesigner/components/connectioneditor/dynamicpropertiesmodel.cpp src/plugins/qmldesigner/components/materialeditor/materialeditorview.h src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp src/plugins/qmldesigner/designercore/model/model.cpp Change-Id: I111b9140375b894a5487cc012b17cc32100bdb8d
| * QmlDesigner: Add support any pickable node with 3d view context menuMiikka Heikkinen2022-09-082-11/+23
| | | | | | | | | | | | | | | | | | | | | | | | Previously only 3D models could be picked for context menu target. Now any node that can be resolved from a point at 3D edit view can be picked. Fixes: QDS-7518 Change-Id: Id4a30d96744c42907d45688493776bdff35b934e Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* | QmlDesigner: Fix material preview env and model aux handlingMiikka Heikkinen2022-09-091-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Converted old auxiliary properties usage in material preview to the new API. Since most properties need to be both persisted to the document and used by puppet, those properties had to be duplicated. Fixes: QTCREATORBUG-28085 Fixes: QDS-7624 Change-Id: Idf51c773a2d49d44413bfaf69d4a683692ea8a0d Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | Merge remote-tracking branch 'origin/8.0'Eike Ziller2022-08-311-1/+1
|\| | | | | | | | | | | | | | | | | Conflicts: src/plugins/debugger/debuggerdialogs.cpp src/plugins/qmldesigner/components/materialeditor/materialeditorview.cpp src/plugins/texteditor/fontsettingspage.cpp Change-Id: I5a6accd2065e0d8320045b57ade7b54a9a09aae0
| * QmlDesigner: Convert the form editor preview image to correct formatMiikka Heikkinen2022-08-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | We were passing the image with premultiplied alpha obtained from QSGRhiLayer::toImage() to be shown in form editor. This corrupts the colors in with 3D materials having partially transparent colors. Converting the image to QImage::Format_ARGB32 format fixes the issue. Fixes: QDS-7474 Change-Id: Id0b689d7e2d9fc111e98f28b18db0af3ac30041f Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | Use SPDX license identifiersLucie Gérard2022-08-2666-1584/+132
| | | | | | | | | | | | | | | | | | Replace the current license disclaimer in files by a SPDX-License-Identifier. Task-number: QTBUG-67283 Change-Id: I708fd1f9f2b73d60f57cc3568646929117825813 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Merge remote-tracking branch 'origin/8.0'Eike Ziller2022-08-267-33/+87
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/qmljs/qmljsmodelmanagerinterface.cpp src/plugins/clangcodemodel/clangdclient.cpp src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp src/plugins/qmldesigner/designercore/include/modelnode.h src/plugins/qmldesigner/designercore/model/modelnode.cpp src/plugins/qmldesigner/designercore/model/rewriterview.cpp Change-Id: I93c57879b79f27325321bfc045ca618bd835af93
| * QmlDesigner: Add delete action to 3D Editor's context menuMahmoud Badri2022-08-251-4/+5
| | | | | | | | | | | | | | | | | | | | This entails selecting a model upon right-clicking if it is not selected. Also fixed a memory leak and small tweaks. Fixes: QDS-7401 Change-Id: I592acb3fff30ecc3236f3cf2fbe126de4fb389dc Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * QmlDesigner: Render state previews for StateGroupThomas Hartmann2022-08-241-7/+17
| | | | | | | | | | | | | | | | | | Render previews for all state groups in the document. Change-Id: I89d9c43a53eb3d9844b863278395fd9098a07772 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
| * QmlDesigner: Add NodeInstanceServer::allGroupStateInstances()Thomas Hartmann2022-08-242-0/+17
| | | | | | | | | | | | Change-Id: I26b20976746c3790d679a63db209fb535eb58382 Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
| * QmlDesigner: Implement ObjectNodeInstance::stateInstances() for StateGroupThomas Hartmann2022-08-241-1/+15
| | | | | | | | | | Change-Id: Ia6e239530d399da34ab63253762e3ebd2a79f4db Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
| * QmlDesigner: Do not set state property on QQuickStateGroupThomas Hartmann2022-08-241-0/+4
| | | | | | | | | | | | | | | | The state is determined by the state view. Change-Id: I3b76b25c618d4f860f13d2e005d88d93a660fbc0 Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
| * QmlDesigner: Always skip when conditionThomas Hartmann2022-08-241-2/+1
| | | | | | | | | | | | | | | | There is no reason to set the when condition ever. Change-Id: I4c6b5ca04cdb7ba62f833225c6878da83a02abaf Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
| * QmlDesigner: Create a context menu for the 3D EditorMahmoud Badri2022-08-222-20/+29
| | | | | | | | | | | | | | | | | | | | | | For now only 1 action is implemented (edit material), more actions are coming next. Task-number: QDS-7414 Task-number: QDS-7398 Change-Id: Id8e36c23d9a4d35ee94d55d3d6b15df78241a05d Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Merge remote-tracking branch 'origin/8.0'Eike Ziller2022-08-192-1/+30
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reverts/comments out parts of 45f93a817a527e6dc81a8971dd2868b3da66cd84, which needs to be resolved in a follow-up commit. Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs qtcreator_ide_branding.pri share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp src/plugins/clangcodemodel/clangmodelmanagersupport.cpp src/plugins/cmakeprojectmanager/cmakesettingspage.cpp src/plugins/python/pythoneditor.cpp src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp src/plugins/scxmleditor/common/colorsettings.cpp Change-Id: I7f0f7b7120e75a9fc3a8886bc57c17345cbb501b
| * QmlDesigner: Add scene root material support to material editor/browserMiikka Heikkinen2022-08-181-17/+7
| | | | | | | | | | | | | | | | | | | | | | If the scene root item is Material subclass, material library is not created for the scene. Material editor and browser functionalities that relate to having material library are disabled. Material editor will always show the material that is the scene root. Fixes: QDS-7374 Change-Id: Icd1c212c17b59e4a2caa6b3b4d7e615e68b21eb9 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
| * QmlDesigner: Add environment and model selectors to material previewMiikka Heikkinen2022-08-112-1/+39
| | | | | | | | | | | | | | | | | | | | The model and the scene environment used to render material previews can now be selected via buttons next to the preview in material editor. Task-number: QDS-7347 Change-Id: I03089029e8420f80ed65be1c7b7a1ce4581f2fd4 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* | QmlDesigner: rotBlock is using it own aux typeMarco Bubke2022-08-162-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | rotBlock was using the mechanism to overwrite values but actually it is only for communication to the puppet. So now there is NodeInstanceAuxiliary as a generic way. NodeInstance was renamed NodeInstancePropertyOverwrite to make it clear that it is for overwriting properties. Task-number: QDS-7338 Change-Id: Id5ab1f5c4761a184964a347f00d1449ae2d7d77f Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | QmlDesigner: Add type enumeration to auxiliary dataMarco Bubke2022-08-092-30/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auxiliary data so far used naming conventions to declare the kind of the data. Now an enumeration is used. The auxiliaryData(...) is returning an optional too so that it is known if a value exists. There is now auxiliaryDataWithDefault(...) which is returning an invalid QVariant instead. The instance cache is now disabled because there is not notification for information changes. So if we get the real data from the node instances there will be no information changes because nothing changed. So the form editor is a strange state of being reset but not all data arrived. Before this patch there were still changes happen because of some side effects that auxiliary properties were sent which were never intended to be sent. If we re-enable the cache we need to send information changes or every view must expect that the information is already there. Task-number: QDS-7338 Change-Id: I0cafd149c53df552c7c8442f1e8ba87f5451dbd1 Reviewed-by: Aleksei German <aleksei.german@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* | Merge remote-tracking branch 'origin/8.0'hjk2022-08-051-0/+1
|\| | | | | | | Change-Id: Icbb87ac8bcee5fb86042d3863a973573510651b4
| * QmlPuppet: Compile fixhjk2022-08-041-0/+1
| | | | | | | | | | | | Change-Id: I4ff0fd46d8e0f2c00857de2b8f6d99a502d2675f Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: hjk <hjk@qt.io>
* | Merge remote-tracking branch 'origin/8.0'hjk2022-08-032-1/+58
|\| | | | | | | Change-Id: I1dc664137eeecb7dd69f29af7a08164683d51077
| * Sync color between environment map and 3D Editor backgroundSamuel Ghinet2022-08-032-1/+60
| | | | | | | | | | | | | | Task-number: QDS-7097 Change-Id: I5f2c83bc43bd589d0d1f32e01e7512ab20a03bcf Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* | qmlpuppet: remove qmlprivategate DesignerSupport < Qt 5.6Tim Jenssen2022-07-1213-83/+89
| | | | | | | | | | | | Task-number: QTCREATORBUG-26600 Change-Id: I629c8cd1f497ed2dd354ff461aa890a77bdc2a01 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlPuppet: Adapt to C++ 17 [[maybe_unused]]Marco Bubke2022-07-1110-106/+56
|/ | | | | | | | It has the advantage to to move the attribute to the declaration instead of using a workaround. Change-Id: Ia6115ab8fefbe03f247edfea2b7bed73e9149068 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Implement drag-n-drop materials to the 3D EditorMahmoud Badri2022-07-011-0/+26
| | | | | | | Fixes: QDS-7011 Change-Id: Id6e4aea2c19561ea861507480636ae2358ece067 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Merge remote-tracking branch 'origin/7.0' into 8.0Tim Jenssen2022-07-015-23/+81
|\ | | | | | | Change-Id: I7cd5d3808007ef739212f4347ba9b16e7b298943
| * QmlDesigner: Ensure materials render properly after puppet resetMiikka Heikkinen2022-06-162-1/+42
| | | | | | | | | | | | | | | | | | | | | | This is a workaround for quick3d issue QTBUG-103316, where material library materials for editor are properly initialized only if the first encountered View3D in the scene is also rendered first. Fixes: QDS-7084 Change-Id: I8bb6a8e6bfe2fcffddfe86f92157d386fdf4095d Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * QDS Editor 3D: Allow the user to select (and reset) the color of grid linesSamuel Ghinet2022-06-162-11/+21
| | | | | | | | | | | | | | Task-number: QDS-7122 Change-Id: I686269e61b53bd5e3d5d1225376930612d869072 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
| * QmlDesigner: Use changed properties to update 3D previewThomas Hartmann2022-06-131-4/+4
| | | | | | | | | | | | | | | | | | EffectReference is always dirty and it is the only dirty flag. Instead, we update now if any property changed. Task-number: QDS-7079 Change-Id: I157cf2d3b15120c33f4a6b3f53e526d555c7f80c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * QmlDesigner: Do not apply smooth rendering if root is a 3D nodeThomas Hartmann2022-06-131-5/+5
| | | | | | | | | | | | Task-number: QDS-7136 Change-Id: I5260153b8d6131160a8d4b67418e81c6f6e4d862 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * QmlDesigner: Add option for smooth rendering in form editorThomas Hartmann2022-06-102-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Smooth rendering turns on MSAA and doubles the resolution for rendered items. With this option enabled everything stays smooth when zooming in. Around factor 8-10 pixels become clearly visible again, but it still looks relatively smooth. I added both MSAA and increased the resolution to one option, for simplicity. The smooth mode takes 4 times the shared memory, which should not be an issue in most cases. For now, the option is not the default. Task-number: QDS-7129 Task-number: QDS-7128 Change-Id: I8a778650bb40f8ba796960db9bc966e8a1efff4e Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Merge remote-tracking branch 'origin/7.0' into 8.0Eike Ziller2022-06-071-2/+11
|\| | | | | | | Change-Id: Ib669e2e993c4675a7382f721ccb7d6ecff11fc20
| * Import3D: Update call to importFile() after change in QtQuick3dChristian Strømme2022-06-061-2/+11
| | | | | | | | | | | | | | | | | | | | | | The function in QtQuick3d will from Qt 6.4.0 accept the json object directly meaning it's no longer necessary to convert to a variant map first. Change-Id: If180672963cbfea78582f245431e246f84111c9b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* | Merge remote-tracking branch 'origin/7.0' into 8.0Eike Ziller2022-06-027-27/+179
|\| | | | | | | | | | | | | Conflicts: src/libs/utils/launchersocket.cpp Change-Id: I7ec649485bb7fc7c299b571d92519d2b7fc9506b
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 18:10:02 +0000