Merge remote-tracking branch 'origin/4.13' into master

Change-Id: Ib60df85a85fc1c94d8cc0dc23ea9fcdb4822bcab

src/plugins/cpptools/compileroptionsbuilder.cpp

@@ -28,8 +28,6 @@
 #include "cppmodelmanager.h"
 #include "headerpathfilter.h"
 
-#include <baremetal/baremetalconstants.h>
-
 #include <coreplugin/icore.h>
 
 #include <projectexplorer/headerpath.h>
@@ -385,8 +383,11 @@ void CompilerOptionsBuilder::addProjectMacros()
 {
     static const int useMacros = qEnvironmentVariableIntValue("QTC_CLANG_USE_TOOLCHAIN_MACROS");
 
-    if (m_projectPart.toolchainType == BareMetal::Constants::IAREW_TOOLCHAIN_TYPEID || useMacros)
+    if (m_projectPart.toolchainType == ProjectExplorer::Constants::CUSTOM_TOOLCHAIN_TYPEID
+            || m_projectPart.toolchainType.name().contains("BareMetal")
+            || useMacros) {
         addMacros(m_projectPart.toolChainMacros);
+    }
 
     addMacros(m_projectPart.projectMacros);
 }

src/plugins/projectexplorer/buildaspects.cpp

@@ -51,7 +51,7 @@ BuildDirectoryAspect::BuildDirectoryAspect() : d(new Private)
     setSettingsKey("ProjectExplorer.BuildConfiguration.BuildDirectory");
     setLabelText(tr("Build directory:"));
     setDisplayStyle(PathChooserDisplay);
-    setExpectedKind(Utils::PathChooser::ExistingDirectory);
+    setExpectedKind(Utils::PathChooser::Directory);
 }
 
 BuildDirectoryAspect::~BuildDirectoryAspect()

src/plugins/qmldesigner/components/debugview/debugview.cpp

@@ -422,10 +422,7 @@ void DebugView::instancesChildrenChanged(const QVector<ModelNode> & nodeList)
 
 void DebugView::customNotification(const AbstractView *view, const QString &identifier, const QList<ModelNode> &nodeList, const QList<QVariant> &data)
 {
-    if (identifier == "PuppetStatus" && data.count() == 1) {
-        m_debugViewWidget->setPuppetStatus(data.constFirst().toString());
-
-    } else if (isDebugViewEnabled()) {
+    if (isDebugViewEnabled()) {
         QTextStream message;
         QString string;
         message.setString(&string);

src/plugins/qmldesigner/components/formeditor/formeditoritem.h

@@ -131,7 +131,7 @@ protected:
     QRectF m_boundingRect;
     QRectF m_paintedBoundingRect;
     QRectF m_selectionBoundingRect;
-    QColor m_frameColor{0xaa, 0xaa, 0xaa};
+    QColor m_frameColor;
 
 private: // functions
     void setup();

src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp

@@ -495,9 +495,6 @@ QProcessEnvironment PuppetCreator::processEnvironment() const
     }
 
 #ifndef QMLDESIGNER_TEST
-    auto view = QmlDesignerPlugin::instance()->viewManager().nodeInstanceView();
-    view->emitCustomNotification("PuppetStatus", {}, {QVariant(m_qrcMapping)});
-
     // set env var if QtQuick3D import exists
     QmlDesigner::Import import = QmlDesigner::Import::createLibraryImport("QtQuick3D", "1.0");
     if (m_model->hasImport(import, true, true))

src/plugins/qmldesigner/designercore/model/modelnode.cpp

@@ -216,7 +216,9 @@ static bool isIdToAvoid(const QString& id)
         "layer",
         "scale",
         "enabled",
-        "anchors"
+        "anchors",
+        "texture",
+        "shaderInfo"
     };
 
     return ids.contains(id);

src/plugins/qmldesigner/qmlpreviewplugin/qmlpreviewplugin.cpp

@@ -158,13 +158,15 @@ void QmlPreviewPlugin::setLanguageLocale(const QString &locale)
 
 QObject *QmlPreviewPlugin::getPreviewPlugin()
 {
-    auto pluginIt = std::find_if(ExtensionSystem::PluginManager::plugins().begin(),
-                                 ExtensionSystem::PluginManager::plugins().end(),
+    const QVector<ExtensionSystem::PluginSpec *> specs = ExtensionSystem::PluginManager::plugins();
+
+    auto pluginIt = std::find_if(specs.begin(),
+                                 specs.end(),
                                  [](const ExtensionSystem::PluginSpec *p) {
         return p->name() == "QmlPreview";
     });
 
-    if (pluginIt != ExtensionSystem::PluginManager::plugins().constEnd())
+    if (pluginIt != specs.end())
         return (*pluginIt)->plugin();
 
     return nullptr;