From 95931b98475c3af7d919e6a3d8a5ab96f8a578bc Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Wed, 4 Jun 2025 15:32:54 +0000 Subject: [PATCH] Revert "QmlDesigner: Fix drag & drop 3D components into 2D/3D view" This reverts commit ae478b557a31abbf2cd04df09ea9b74418e5dcf6. Reason for revert: had unresolved conflicts Change-Id: I470221786f5cb70d6f048cadbc5d421438dafd26 Reviewed-by: Tim Jenssen --- .../libs/designercore/include/model.h | 1 - .../libs/designercore/include/nodemetainfo.h | 64 ------------------- .../designercore/metainfo/nodemetainfo.cpp | 23 ------- .../metainfo/subcomponentmanager.cpp | 10 --- .../libs/designercore/model/model.cpp | 10 --- .../projectstorage/commontypecache.h | 2 - 6 files changed, 110 deletions(-) diff --git a/src/plugins/qmldesigner/libs/designercore/include/model.h b/src/plugins/qmldesigner/libs/designercore/include/model.h index 3771ba00689..9c8bcd10827 100644 --- a/src/plugins/qmldesigner/libs/designercore/include/model.h +++ b/src/plugins/qmldesigner/libs/designercore/include/model.h @@ -173,7 +173,6 @@ public: NodeMetaInfo qtQuick3DMaterialMetaInfo() const; NodeMetaInfo qtQuick3DModelMetaInfo() const; NodeMetaInfo qtQuick3DNodeMetaInfo() const; - NodeMetaInfo qtQuick3DObject3DMetaInfo() const; NodeMetaInfo qtQuick3DOrthographicCameraMetaInfo() const; NodeMetaInfo qtQuick3DParticles3DSpriteParticle3DMetaInfo() const; NodeMetaInfo qtQuick3DPerspectiveCameraMetaInfo() const; diff --git a/src/plugins/qmldesigner/libs/designercore/include/nodemetainfo.h b/src/plugins/qmldesigner/libs/designercore/include/nodemetainfo.h index 9d7e0c7d4d0..fa867cce033 100644 --- a/src/plugins/qmldesigner/libs/designercore/include/nodemetainfo.h +++ b/src/plugins/qmldesigner/libs/designercore/include/nodemetainfo.h @@ -189,7 +189,6 @@ public: bool isQtQuickListView() const; bool isQtQuickGridView() const; bool isQtQuick3DMaterial() const; -<<<<<<< HEAD (8777d4 qds: increase version to 4.7.2) bool isQtQuick3DModel() const; bool isQtQuick3DNode() const; bool isQtQuick3DParticlesAbstractShape() const; @@ -250,69 +249,6 @@ public: bool isVector4D() const; bool isView() const; bool usesCustomParser() const; -======= - bool isQtQuick3DModel(SL sl = {}) const; - bool isQtQuick3DNode(SL sl = {}) const; - bool isQtQuick3DObject3D(SL sl = {}) const; - bool isQtQuick3DParticlesAbstractShape(SL sl = {}) const; - bool isQtQuick3DParticles3DAffector3D(SL sl = {}) const; - bool isQtQuick3DParticles3DAttractor3D(SL sl = {}) const; - bool isQtQuick3DParticles3DParticle3D(SL sl = {}) const; - bool isQtQuick3DParticles3DParticleEmitter3D(SL sl = {}) const; - bool isQtQuick3DParticles3DSpriteParticle3D(SL sl = {}) const; - bool isQtQuick3DPass(SL sl = {}) const; - bool isQtQuick3DPrincipledMaterial(SL sl = {}) const; - bool isQtQuick3DSpecularGlossyMaterial(SL sl = {}) const; - bool isQtQuick3DSceneEnvironment(SL sl = {}) const; - bool isQtQuick3DShader(SL sl = {}) const; - bool isQtQuick3DTexture(SL sl = {}) const; - bool isQtQuick3DTextureInput(SL sl = {}) const; - bool isQtQuick3DCubeMapTexture(SL sl = {}) const; - bool isQtQuick3DView3D(SL sl = {}) const; - bool isQtQuickBorderImage(SL sl = {}) const; - bool isQtQuickControlsLabel(SL sl = {}) const; - bool isQtQuickControlsSwipeView(SL sl = {}) const; - bool isQtQuickControlsTabBar(SL sl = {}) const; - bool isQtQuickExtrasPicture(SL sl = {}) const; - bool isQtQuickGradient(SL sl = {}) const; - bool isQtQuickImage(SL sl = {}) const; - bool isQtQuickItem(SL sl = {}) const; - bool isQtQuickLayoutsLayout(SL sl = {}) const; - bool isQtQuickLoader(SL sl = {}) const; - bool isQtQuickPath(SL sl = {}) const; - bool isQtQuickPauseAnimation(SL sl = {}) const; - bool isQtQuickPositioner(SL sl = {}) const; - bool isQtQuickPropertyAnimation(SL sl = {}) const; - bool isQtQuickPropertyChanges(SL sl = {}) const; - bool isQtQuickRectangle(SL sl = {}) const; - bool isQtQuickRepeater(SL sl = {}) const; - bool isQtQuickShapesShape(SL sl = {}) const; - bool isQtQuickState(SL sl = {}) const; - bool isQtQuickStateGroup(SL sl = {}) const; - bool isQtQuickStateOperation(SL sl = {}) const; - bool isQtQuickStudioComponentsArcItem(SL sl = {}) const; - bool isQtQuickStudioComponentsGroupItem(SL sl = {}) const; - bool isQtQuickStudioComponentsSvgPathItem(SL sl = {}) const; - bool isQtQuickStudioUtilsJsonListModel(SL sl = {}) const; - bool isQtQuickText(SL sl = {}) const; - bool isQtQuickTimelineKeyframe(SL sl = {}) const; - bool isQtQuickTimelineKeyframeGroup(SL sl = {}) const; - bool isQtQuickTimelineTimeline(SL sl = {}) const; - bool isQtQuickTimelineTimelineAnimation(SL sl = {}) const; - bool isQtQuickTransition(SL sl = {}) const; - bool isQtQuickWindowWindow(SL sl = {}) const; - bool isQtSafeRendererSafePicture(SL sl = {}) const; - bool isQtSafeRendererSafeRendererPicture(SL sl = {}) const; - bool isString(SL sl = {}) const; - bool isSuitableForMouseAreaFill(SL sl = {}) const; - bool isUrl(SL sl = {}) const; - bool isVariant(SL sl = {}) const; - bool isVector2D(SL sl = {}) const; - bool isVector3D(SL sl = {}) const; - bool isVector4D(SL sl = {}) const; - bool isView(SL sl = {}) const; - bool usesCustomParser(SL sl = {}) const; ->>>>>>> CHANGE (472b88 QmlDesigner: Fix drag & drop 3D components into 2D/3D view) bool isEnumeration() const; #ifndef QDS_USE_PROJECTSTORAGE diff --git a/src/plugins/qmldesigner/libs/designercore/metainfo/nodemetainfo.cpp b/src/plugins/qmldesigner/libs/designercore/metainfo/nodemetainfo.cpp index 5221797a8c5..b0320704fc9 100644 --- a/src/plugins/qmldesigner/libs/designercore/metainfo/nodemetainfo.cpp +++ b/src/plugins/qmldesigner/libs/designercore/metainfo/nodemetainfo.cpp @@ -4156,30 +4156,7 @@ bool NodeMetaInfo::isQtQuick3DNode() const } } -<<<<<<< HEAD (8777d4 qds: increase version to 4.7.2) bool NodeMetaInfo::isQtQuick3DParticles3DAffector3D() const -======= -bool NodeMetaInfo::isQtQuick3DObject3D(SL sl) const -{ - if constexpr (useProjectStorage()) { - if (!isValid()) - return false; - - using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is QtQuick3D.Object3D", - category(), - keyValue("type id", m_typeId), - keyValue("caller location", sl)}; - - using namespace Storage::Info; - return isBasedOnCommonType(m_projectStorage, m_typeId); - } else { - return isValid() && isSubclassOf("QtQuick3D.Object3D"); - } -} - -bool NodeMetaInfo::isQtQuick3DParticles3DAffector3D(SL sl) const ->>>>>>> CHANGE (472b88 QmlDesigner: Fix drag & drop 3D components into 2D/3D view) { if constexpr (useProjectStorage()) { if (!isValid()) diff --git a/src/plugins/qmldesigner/libs/designercore/metainfo/subcomponentmanager.cpp b/src/plugins/qmldesigner/libs/designercore/metainfo/subcomponentmanager.cpp index 51571429e2e..82ea48900aa 100644 --- a/src/plugins/qmldesigner/libs/designercore/metainfo/subcomponentmanager.cpp +++ b/src/plugins/qmldesigner/libs/designercore/metainfo/subcomponentmanager.cpp @@ -372,16 +372,6 @@ void SubComponentManager::registerQmlFile(const QFileInfo &fileInfo, const QStri if (!qualifier.isEmpty()) itemLibraryEntry.setRequiredImport(fixedQualifier); - const NodeMetaInfo nodeMetaInfo = model()->metaInfo(baseComponentName.toUtf8()); - if (nodeMetaInfo.isValid()) { - QHash hints; - if (nodeMetaInfo.isBasedOn(model()->qtQuick3DObject3DMetaInfo())) - hints["canBeDroppedInFormEditor"] = "false"; - if (nodeMetaInfo.isBasedOn(model()->qtQuick3DNodeMetaInfo())) - hints["canBeDroppedInView3D"] = "true"; - itemLibraryEntry.addHints(hints); - } - if (!model()->metaInfo().itemLibraryInfo()->containsEntry(itemLibraryEntry)) model()->metaInfo().itemLibraryInfo()->addEntries({itemLibraryEntry}); } diff --git a/src/plugins/qmldesigner/libs/designercore/model/model.cpp b/src/plugins/qmldesigner/libs/designercore/model/model.cpp index 2d2c9cbebc6..eac261eca8c 100644 --- a/src/plugins/qmldesigner/libs/designercore/model/model.cpp +++ b/src/plugins/qmldesigner/libs/designercore/model/model.cpp @@ -2544,16 +2544,6 @@ NodeMetaInfo Model::qtQuick3DNodeMetaInfo() const } } -NodeMetaInfo Model::qtQuick3DObject3DMetaInfo() const -{ - if constexpr (useProjectStorage()) { - using namespace Storage::Info; - return createNodeMetaInfo(); - } else { - return metaInfo("QtQuick3D.Object3D"); - } -} - NodeMetaInfo Model::qtQuick3DPointLightMetaInfo() const { if constexpr (useProjectStorage()) { diff --git a/src/plugins/qmldesigner/libs/designercore/projectstorage/commontypecache.h b/src/plugins/qmldesigner/libs/designercore/projectstorage/commontypecache.h index a69251db2fe..c979052a676 100644 --- a/src/plugins/qmldesigner/libs/designercore/projectstorage/commontypecache.h +++ b/src/plugins/qmldesigner/libs/designercore/projectstorage/commontypecache.h @@ -71,7 +71,6 @@ inline constexpr char Material[] = "Material"; inline constexpr char Model[] = "Model"; inline constexpr char MouseArea[] = "MouseArea"; inline constexpr char Node[] = "Node"; -inline constexpr char Object3D[] = "Object3D"; inline constexpr char OrthographicCamera[] = "OrthographicCamera"; inline constexpr char Particle3D[] = "Particle3D"; inline constexpr char ParticleEmitter3D[] = "ParticleEmitter3D"; @@ -224,7 +223,6 @@ class CommonTypeCache CacheType, CacheType, CacheType, - CacheType, CacheType, CacheType, CacheType,