Merge remote-tracking branch 'origin/8.0'

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

src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp

@@ -3,8 +3,10 @@
 
 #include "materialbrowserview.h"
 #include "bindingproperty.h"
+#include "bundlematerial.h"
 #include "materialbrowsermodel.h"
 #include "materialbrowserwidget.h"
+#include "materialbrowserbundlemodel.h"
 #include "nodeabstractproperty.h"
 #include "nodemetainfo.h"
 #include "qmlobjectnode.h"
@@ -14,9 +16,12 @@
 #include <designmodecontext.h>
 #include <nodeinstanceview.h>
 #include <nodemetainfo.h>
+#include <nodelistproperty.h>
 #include <qmldesignerconstants.h>
 
 #include <QQuickItem>
+#include <QRegularExpression>
+#include <QTimer>
 
 namespace QmlDesigner {
 
@@ -93,6 +98,80 @@ WidgetInfo MaterialBrowserView::widgetInfo()
                 }
             });
         });
+
+        connect(m_widget, &MaterialBrowserWidget::bundleMaterialDragStarted, this,
+                [&] (QmlDesigner::BundleMaterial *bundleMat) {
+            m_draggedBundleMaterial = bundleMat;
+        });
+
+        MaterialBrowserBundleModel *matBrowserBundleModel = m_widget->materialBrowserBundleModel().data();
+
+        connect(matBrowserBundleModel, &MaterialBrowserBundleModel::applyToSelectedTriggered, this,
+                [&] (BundleMaterial *material, bool add) {
+            if (!m_selectedModel.isValid())
+                return;
+
+            m_bundleMaterialDropTarget = m_selectedModel;
+            m_bundleMaterialAddToSelected = add;
+            m_widget->materialBrowserBundleModel()->addMaterial(material);
+        });
+
+        connect(matBrowserBundleModel, &MaterialBrowserBundleModel::addBundleMaterialToProjectRequested, this,
+                [&] (const QmlDesigner::NodeMetaInfo &metaInfo) {
+            ModelNode matLib = materialLibraryNode();
+            if (!matLib.isValid())
+                return;
+
+            executeInTransaction("MaterialBrowserView::widgetInfo", [&] {
+                ModelNode newMatNode = createModelNode(metaInfo.typeName(), metaInfo.majorVersion(),
+                                                                            metaInfo.minorVersion());
+                matLib.defaultNodeListProperty().reparentHere(newMatNode);
+
+                static QRegularExpression rgx("([A-Z])([a-z]*)");
+                QString newName = QString::fromLatin1(metaInfo.simplifiedTypeName()).replace(rgx, " \\1\\2").trimmed();
+                QString newId = model()->generateIdFromName(newName, "material");
+                newMatNode.setIdWithRefactoring(newId);
+
+                VariantProperty objNameProp = newMatNode.variantProperty("objectName");
+                objNameProp.setValue(newName);
+
+                if (m_bundleMaterialDropTarget.isValid()) {
+                    QmlObjectNode qmlObjNode(m_bundleMaterialDropTarget);
+                    if (m_bundleMaterialAddToSelected) {
+                        // TODO: unify this logic as it exist elsewhere also
+                        auto expToList = [](const QString &exp) {
+                            QString copy = exp;
+                            copy = copy.remove("[").remove("]");
+
+                            QStringList tmp = copy.split(',', Qt::SkipEmptyParts);
+                            for (QString &str : tmp)
+                                str = str.trimmed();
+
+                            return tmp;
+                        };
+
+                        auto listToExp = [](QStringList &stringList) {
+                            if (stringList.size() > 1)
+                                return QString("[" + stringList.join(",") + "]");
+
+                            if (stringList.size() == 1)
+                                return stringList.first();
+
+                            return QString();
+                        };
+                        QStringList matList = expToList(qmlObjNode.expression("materials"));
+                        matList.append(newMatNode.id());
+                        QString updatedExp = listToExp(matList);
+                        qmlObjNode.setBindingProperty("materials", updatedExp);
+                    } else {
+                        qmlObjNode.setBindingProperty("materials", newMatNode.id());
+                    }
+                    m_bundleMaterialDropTarget = {};
+                }
+
+                m_bundleMaterialAddToSelected = false;
+            });
+        });
     }
 
     return createWidgetInfo(m_widget.data(),
@@ -162,24 +241,24 @@ void MaterialBrowserView::modelAboutToBeDetached(Model *model)
 void MaterialBrowserView::selectedNodesChanged(const QList<ModelNode> &selectedNodeList,
                                                [[maybe_unused]] const QList<ModelNode> &lastSelectedNodeList)
 {
-    ModelNode selectedModel;
+    m_selectedModel = {};
 
     for (const ModelNode &node : selectedNodeList) {
         if (node.metaInfo().isQtQuick3DModel()) {
-            selectedModel = node;
+            m_selectedModel = node;
             break;
         }
     }
 
-    m_widget->materialBrowserModel()->setHasModelSelection(selectedModel.isValid());
+    m_widget->materialBrowserModel()->setHasModelSelection(m_selectedModel.isValid());
 
     if (!m_autoSelectModelMaterial)
         return;
 
-    if (selectedNodeList.size() > 1 || !selectedModel.isValid())
+    if (selectedNodeList.size() > 1 || !m_selectedModel.isValid())
         return;
 
-    QmlObjectNode qmlObjNode(selectedModel);
+    QmlObjectNode qmlObjNode(m_selectedModel);
     QString matExp = qmlObjNode.expression("materials");
     if (matExp.isEmpty())
         return;
@@ -307,6 +386,10 @@ void MaterialBrowserView::customNotification(const AbstractView *view,
         });
     } else if (identifier == "delete_selected_material") {
         m_widget->materialBrowserModel()->deleteSelectedMaterial();
+    } else if (identifier == "drop_bundle_material") {
+        m_bundleMaterialDropTarget = nodeList.first();
+        m_widget->materialBrowserBundleModel()->addMaterial(m_draggedBundleMaterial);
+        m_draggedBundleMaterial = nullptr;
     }
 }