Merge remote-tracking branch 'origin/9.0'

Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp

Change-Id: I154a9ababa9e166cb06e98652d481fe6234f6399

src/plugins/mcusupport/mcusupportoptionspage.cpp

@@ -7,6 +7,7 @@
 #include "mcusupportconstants.h"
 #include "mcusupportoptions.h"
 #include "mcusupportsdk.h"
+#include "mcusupporttr.h"
 #include "mcutarget.h"
 #include "mcutargetfactory.h"
 #include "settingshandler.h"
@@ -28,6 +29,7 @@
 #include <QGroupBox>
 #include <QHBoxLayout>
 #include <QLabel>
+#include <QMessageBox>
 #include <QPushButton>
 #include <QVBoxLayout>
 
@@ -287,9 +289,30 @@ void McuSupportOptionsWidget::apply()
     bool pathsChanged = false;
 
     m_settingsHandler->setAutomaticKitCreation(m_options.automaticKitCreationEnabled());
-    McuTargetFactory::expandVariables(m_options.sdkRepository.packages);
+    m_options.sdkRepository.expandVariablesAndWildcards();
+
+    QMessageBox warningPopup(QMessageBox::Icon::Warning,
+                             Tr::tr("Warning"),
+                             Tr::tr("Unable to apply changes in Devices > MCU."),
+                             QMessageBox::Ok,
+                             this);
+
+    auto target = currentMcuTarget();
+    if (!target) {
+        warningPopup.setInformativeText(Tr::tr("No target selected."));
+        warningPopup.exec();
+        return;
+    }
+    if (!target->isValid()) {
+        warningPopup.setInformativeText(
+            Tr::tr("Invalid paths present for target\n%1")
+                .arg(McuKitManager::generateKitNameFromTarget(target.get())));
+        warningPopup.exec();
+        return;
+    }
+
     pathsChanged |= m_options.qtForMCUsSdkPackage->writeToSettings();
-    for (const auto &package : std::as_const(m_options.sdkRepository.packages))
+    for (const auto &package : target->packages())
         pathsChanged |= package->writeToSettings();
 
     if (pathsChanged) {