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

Merge remote-tracking branch 'origin/8.0' into 9.0

Browse Source 
Conflicts:
	src/plugins/mcusupport/mcusupportsdk.cpp
	src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp
	src/plugins/qmldesigner/components/materialbrowser/bundleimporter.cpp
	src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp

Change-Id: I9317da0fc1243b9ce6d87f577aa843c51f132ad7
This commit is contained in:
Eike Ziller
2022-10-18 10:48:46 +02:00
parent ce6ab1a14d 6276f5514d
commit ea5a050c5c
74 changed files with 1782 additions and 1113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp
View File

@@ -14,6 +14,7 @@
#include "viewmanager.h"
#include <seekerslider.h>
#include <nodeinstanceview.h>
#include <import.h>
#include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/command.h>
@@ -208,14 +209,21 @@ void Edit3DWidget::updateCreateSubMenu(const QStringList &keys,
void Edit3DWidget::onCreateAction()
{
// QAction *action = qobject_cast<QAction *>(sender());
// if (!action)
// if (!action || !m_view || !m_view->model())
// return;
// m_view->executeInTransaction(__FUNCTION__, [&] {
// int activeScene = m_view->rootModelNode().auxiliaryData("active3dScene@Internal").toInt();
// ItemLibraryEntry entry = m_nameToEntry.value(action->data().toString());
// Import import = Import::createLibraryImport(entry.requiredImport(),
// QString::number(entry.majorVersion())
// + QLatin1Char('.')
// + QString::number(entry.minorVersion()));
// if (!m_view->model()->hasImport(import))
// m_view->model()->changeImports({import}, {});
// auto modelNode = QmlVisualNode::createQml3DNode(m_view, m_nameToEntry.value(action->data().toString()),
// activeScene, m_contextMenuPos3d).modelNode();
// int activeScene = m_view->rootModelNode().auxiliaryData("active3dScene@Internal").toInt();
// auto modelNode = QmlVisualNode::createQml3DNode(m_view, entry,
// activeScene, m_contextMenuPos3d).modelNode();
// QTC_ASSERT(modelNode.isValid(), return);
// m_view->setSelectedModelNode(modelNode);