Merge remote-tracking branch 'origin/14.0'

 Conflicts:
	src/plugins/android/androidmanager.cpp
	src/plugins/android/androidrunner.cpp
	src/plugins/android/androidrunner.h
	src/plugins/qmldesigner/components/texteditor/texteditorview.cpp
	src/plugins/qmldesigner/components/texteditor/texteditorview.h
	src/plugins/qmldesigner/designmodecontext.cpp
	src/plugins/qmldesigner/designmodecontext.h
	src/plugins/qmljseditor/qmljseditingsettingspage.cpp

Change-Id: Idada49bb7441e8c5b748bd75b2e6bb2351bd323e

1 files changed, 3 insertions, 0 deletions

diff --git a/src/plugins/extensionmanager/extensionmanagerwidget.cpp b/src/plugins/extensionmanager/extensionmanagerwidget.cpp
index 493f8ebe40d..ecd1b792a1e 100644
--- a/src/plugins/extensionmanager/extensionmanagerwidget.cpp
+++ b/src/plugins/extensionmanager/extensionmanagerwidget.cpp
@@ -282,6 +282,8 @@ public:
             }
         });
 
+        connect(ExtensionSystem::PluginManager::instance(),
+                &ExtensionSystem::PluginManager::pluginsChanged, this, &PluginStatusWidget::update);
         connect(m_restartButton, &QAbstractButton::clicked,
                 ICore::instance(), &ICore::restart, Qt::QueuedConnection);
 
@@ -429,6 +431,7 @@ ExtensionManagerWidget::ExtensionManagerWidget()
     m_linksTitle = sectionTitle(h6CapitalTF, Tr::tr("More information"));
     m_links = tfLabel(contentTF, false);
     m_links->setOpenExternalLinks(true);
+    m_links->setTextInteractionFlags(Qt::TextBrowserInteraction);
     m_imageTitle = sectionTitle(h6CapitalTF, {});
     m_image = new QLabel;
     m_imageMovie.setDevice(&m_imageDataBuffer);