diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-11-17 15:27:54 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-11-18 11:03:02 +0000 |
| commit | f88deb5b70723fccb8e5b624a987b452d3005e14 (patch) | |
| tree | 7255a4daaa2e576b0a6b3b173f17610e601a12ff /src | |
| parent | 03a047db2c818137b056d598bff5549a5fa1fca3 (diff) | |
Plugin install wizard: Search in subdirectories of archive too
Default install structure of a plugin is in a subdirectory like in a Qt
Creator installation.
Change-Id: Ia4e5a08eb9fbe4b1586ff5d406cae1883e7dbd59
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/coreplugin/plugininstallwizard.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/plugins/coreplugin/plugininstallwizard.cpp b/src/plugins/coreplugin/plugininstallwizard.cpp index 59380bd191..c91629e5aa 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() |