diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-05-23 16:23:24 +0200 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-05-26 12:28:02 +0000 |
| commit | f9dbcb724f8ea735532620db9859ea8cc9a74e6d (patch) | |
| tree | 736e4dfc8d7a2bdd9a78f540dfb397a74da17237 | |
| parent | b86216cc4c3a97d21a7b7fac0f0cf0a550d06b01 (diff) | |
Revert "androiddeployqt: don't include plugins that are not necessary"
This reverts commit 4f6d0ee8743f57d29e6f1fd13440c7242bea6134.
It prevented some files in QtQuick.Controls 1 and QtQuick.Dialogs
from being deployed, and the result was that Dialogs could not be used
at all.
Task-number: QTBUG-60918
Change-Id: Id2bb8edba54b0dd1c29ab558690db3c342aa8ee7
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Oleg Yadrov <oleg.yadrov@qt.io>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| -rw-r--r-- | src/androiddeployqt/main.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/androiddeployqt/main.cpp b/src/androiddeployqt/main.cpp index da3b82679..dd5b74bd6 100644 --- a/src/androiddeployqt/main.cpp +++ b/src/androiddeployqt/main.cpp @@ -308,11 +308,6 @@ void deleteMissingFiles(const Options &options, const QDir &srcDir, const QDir & fflush(stdout); } -bool containsModule(const QDir &dir) { - QStringList nameFilters = { QLatin1String("qmldir") }; - QFileInfoList entries = dir.entryInfoList(nameFilters, QDir::Files); - return (!entries.isEmpty()); -} Options parseOptions() { @@ -1731,11 +1726,6 @@ bool scanImports(Options *options, QSet<QString> *usedDependencies) if (usedDependencies->contains(fileName.absolutePath)) continue; - // Exclude modules in subfolders - QDir parentDir = QFileInfo(fileName.absolutePath).absoluteDir(); - if (parentDir.absolutePath() != path && containsModule(parentDir)) - continue; - usedDependencies->insert(fileName.absolutePath); if (options->verbose) |