From 88e02bb0a9b97d68a4b270e4ddfb6d0847c702a9 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 22 May 2017 13:21:02 +0200 Subject: windeployqt: Unconditionally deploy all files of Quick Controls 1 The files are added to resource files only in the case of static builds; so, for Windows UWP 64, for which QML caching is disabled, they were missing. Task-number: QTBUG-60536 Change-Id: Idb795f71441ab1bfbc1cdbc53a322ee9e86e54bc Reviewed-by: Simon Hausmann --- src/windeployqt/main.cpp | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/windeployqt/main.cpp b/src/windeployqt/main.cpp index 4f14b4cd0..dfa906b29 100644 --- a/src/windeployqt/main.cpp +++ b/src/windeployqt/main.cpp @@ -728,17 +728,11 @@ static QString pdbFileName(QString libraryFileName) libraryFileName.replace(lastDot, libraryFileName.size() - lastDot, QLatin1String("pdb")); return libraryFileName; } - static inline QStringList qmlCacheFileFilters() { return QStringList() << QStringLiteral("*.jsc") << QStringLiteral("*.qmlc"); } -static bool hasQmlCacheFiles(const QString &path) -{ - return !QDir(path).entryInfoList(qmlCacheFileFilters(), QDir::Files).isEmpty(); -} - // File entry filter function for updateFile() that returns a list of files for // QML import trees: DLLs (matching debgug) and .qml/,js, etc. class QmlDirectoryFileEntryFunction { @@ -1458,11 +1452,6 @@ static DeployResult deploy(const Options &options, return result; unsigned updateFileFlags = options.updateFileFlags | SkipQmlDesignerSpecificsDirectories; unsigned qmlDirectoryFileFlags = 0; - // QML files of Controls 1 not needed unless cached files are present (5.9) - if (quickControlsImportPath(module.sourcePath) == 1 && !hasQmlCacheFiles(module.sourcePath)) { - updateFileFlags |= RemoveEmptyQmlDirectories; - qmlDirectoryFileFlags |= QmlDirectoryFileEntryFunction::SkipSources; - } if (options.deployPdb) qmlDirectoryFileFlags |= QmlDirectoryFileEntryFunction::DeployPdb; if (!updateFile(module.sourcePath, QmlDirectoryFileEntryFunction(options.platform, debugMatchMode, qmlDirectoryFileFlags), -- cgit v1.2.3