Merge remote-tracking branch 'origin/7.0'

Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/docker/dockerdevice.cpp
	src/plugins/mcusupport/mcupackage.cpp
	src/plugins/mcusupport/mcupackage.h
	src/plugins/mcusupport/mcusupportoptions.cpp
	src/plugins/mcusupport/mcusupportoptions.h
	src/plugins/mcusupport/mcusupportoptionspage.cpp
	src/plugins/mcusupport/mcusupportsdk.cpp
	src/plugins/mcusupport/mcusupportsdk.h

Change-Id: I8c8f5953a21729ba9178dbc44ed613eed131a0c8

src/plugins/mcusupport/mcusupportplugin.cpp

@@ -31,6 +31,10 @@
 #include "mcusupportoptionspage.h"
 #include "mcusupportrunconfiguration.h"
 
+#if defined(WITH_TESTS) && defined(GOOGLE_TEST_IS_FOUND)
+#include "test/unittest.h"
+#endif
+
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/icontext.h>
 #include <coreplugin/icore.h>
@@ -59,14 +63,9 @@ public:
                                       {Constants::RUNCONFIGURATION}};
     McuSupportOptionsPage optionsPage;
     McuDependenciesKitAspect environmentPathsKitAspect;
-};
+}; // class McuSupportPluginPrivate
 
-static McuSupportPluginPrivate *dd = nullptr;
-
-McuSupportPlugin::McuSupportPlugin()
-{
-    setObjectName("McuSupportPlugin");
-}
+static McuSupportPluginPrivate* dd{nullptr};
 
 McuSupportPlugin::~McuSupportPlugin()
 {
@@ -79,6 +78,7 @@ bool McuSupportPlugin::initialize(const QStringList &arguments, QString *errorSt
     Q_UNUSED(arguments)
     Q_UNUSED(errorString)
 
+    setObjectName("McuSupportPlugin");
     dd = new McuSupportPluginPrivate;
 
     McuSupportOptions::registerQchFiles();
@@ -147,5 +147,14 @@ void McuSupportPlugin::askUserAboutMcuSupportKitsUpgrade()
     ICore::infoBar()->addInfo(info);
 }
 
+QVector<QObject *> McuSupportPlugin::createTestObjects() const
+{
+    QVector<QObject *> tests;
+#if defined(WITH_TESTS) && defined(GOOGLE_TEST_IS_FOUND)
+    tests << new Test::McuSupportTest;
+#endif
+    return tests;
+}
+
 } // namespace Internal
 } // namespace McuSupport