Merge remote-tracking branch 'origin/4.14'

Change-Id: Iea84f23cf394de13e99a9ed777c8c113e4eff473

1 files changed, 7 insertions, 4 deletions

diff --git a/src/plugins/coreplugin/plugininstallwizard.cpp b/src/plugins/coreplugin/plugininstallwizard.cpp
index 09e23eb6e9..c9ce41b348 100644
--- a/src/plugins/coreplugin/plugininstallwizard.cpp
+++ b/src/plugins/coreplugin/plugininstallwizard.cpp
@@ -270,7 +270,10 @@ public:
         PluginSpec *coreplugin = CorePlugin::instance()->pluginSpec();
 
         // look for plugin
-        QDirIterator it(m_tempDir->path(), libraryNameFilter(), QDir::Files | QDir::NoSymLinks);
+        QDirIterator it(m_tempDir->path(),
+                        libraryNameFilter(),
+                        QDir::Files | QDir::NoSymLinks,
+                        QDirIterator::Subdirectories);
         while (it.hasNext()) {
             if (fi.isCanceled())
                 return;
@@ -298,9 +301,9 @@ public:
                 return; // successful / no error
             }
         }
-        fi.reportResult({PluginInstallWizard::tr("Did not find %1 plugin in toplevel directory.")
-                             .arg(Constants::IDE_DISPLAY_NAME),
-                         InfoLabel::Error});
+        fi.reportResult(
+            {PluginInstallWizard::tr("Did not find %1 plugin.").arg(Constants::IDE_DISPLAY_NAME),
+             InfoLabel::Error});
     }
 
     void cleanupPage() final