feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/8.0'

Browse Source 
Conflicts:
	src/libs/utils/deviceshell.cpp
	src/plugins/clangcodemodel/clangdclient.cpp
	src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp
	src/plugins/remotelinux/linuxdevice.cpp

Change-Id: Idc2edf428c98e9cbc891f1833b271ce2def9a835
This commit is contained in:
Eike Ziller
2022-09-21 10:59:59 +02:00
parent d696f3380c 5ebb467cc6
commit 3011548066
34 changed files with 1283 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/qmldesigner/components/edit3d/edit3dview.cpp
View File

@@ -1,15 +1,16 @@
// Copyright (C) 2020 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
#include "edit3dview.h"
#include "backgroundcolorselection.h"
#include "edit3dactions.h"
#include "edit3dcanvas.h"
#include "edit3dview.h"
#include "edit3dwidget.h"
#include "edit3dviewconfig.h"
#include "backgroundcolorselection.h"
#include "edit3dwidget.h"
#include "metainfo.h"
#include "seekerslider.h"
#include "nodehints.h"
#include "seekerslider.h"
#include "view3dactioncommand.h"
#include <auxiliarydataproperties.h>
#include <coreplugin/icore.h>
@@ -287,6 +288,8 @@ void Edit3DView::nodeAtPosReady(const ModelNode &modelNode, const QVector3D &pos
assignMaterialTo3dModel(modelNode, m_droppedMaterial);
});
}
} else if (m_nodeAtPosReqType == NodeAtPosReqType::BundleMaterialDrop) {
emitCustomNotification("drop_bundle_material", {modelNode}); // To MaterialBrowserView
}
m_nodeAtPosReqType = NodeAtPosReqType::None;
}
@@ -837,4 +840,11 @@ void Edit3DView::dropMaterial(const ModelNode &matNode, const QPointF &pos)
emitView3DAction(View3DActionType::GetNodeAtPos, pos);
}
void Edit3DView::dropBundleMaterial(const QPointF &pos)
{
m_nodeAtPosReqType = NodeAtPosReqType::BundleMaterialDrop;
QmlDesignerPlugin::instance()->viewManager().nodeInstanceView()->view3DAction(
View3DActionType::GetNodeAtPos, pos);
}
} // namespace QmlDesigner