diff --git a/.gitmodules b/.gitmodules index 73c9af8..048b77a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,6 +10,9 @@ [submodule "installer"] path = installer url = https://github.com/QuasarApp/DesktopInstaller.git +[submodule "QuasarAppScripts"] + path = QuasarAppScripts + url = https://github.com/QuasarApp/QuasarAppScripts.git [submodule "doc/wiki"] path = doc/wiki url = https://github.com/QuasarApp/CQtDeployer.wiki.git diff --git a/CQtDeployer.pro b/CQtDeployer.pro index 54d1127..b048431 100644 --- a/CQtDeployer.pro +++ b/CQtDeployer.pro @@ -37,7 +37,7 @@ CONFIG += ordered QuasarAppLib.file = $$PWD/QuasarAppLib/QuasarApp.pro Pe.file = $$PWD/pe/pe-parser-library/pe-parser-library.pro - include('$$PWD/installer/installerCQtDeployer.pri') + include('$$PWD/QIFData/installerCQtDeployer.pri') include($$PWD/doc/wiki.pri) DISTFILES += \ diff --git a/Deploy/dependenciesscanner.cpp b/Deploy/dependenciesscanner.cpp index aa9a187..31264eb 100644 --- a/Deploy/dependenciesscanner.cpp +++ b/Deploy/dependenciesscanner.cpp @@ -87,7 +87,7 @@ bool DependenciesScanner::fillLibInfo(LibInfo &info, const QString &file) const } } -void DependenciesScanner::recursiveDep(LibInfo &lib, QSet<LibInfo> &res) { +void DependenciesScanner::recursiveDep(LibInfo &lib, QSet<LibInfo> &res, QSet<QString>& libStack) { QuasarAppUtils::Params::verboseLog("get recursive dependencies of " + lib.fullPath(), QuasarAppUtils::Info); @@ -104,6 +104,14 @@ void DependenciesScanner::recursiveDep(LibInfo &lib, QSet<LibInfo> &res) { return; } + if (libStack.contains(lib.fullPath())) { + QuasarAppUtils::Params::verboseLog("A recursive dependency was found in library " + lib.fullPath(), + QuasarAppUtils::Warning); + return; + } + + libStack.insert(lib.fullPath()); + for (auto i : lib.dependncies) { auto libs = getLibsFromEnvirement(i); @@ -127,7 +135,10 @@ void DependenciesScanner::recursiveDep(LibInfo &lib, QSet<LibInfo> &res) { if (!scanedLib.isValid()) { QSet<LibInfo> listDep = {}; - recursiveDep(*dep, listDep); + if (!lib.name.compare(dep.value().name, ONLY_WIN_CASE_INSENSIATIVE)) + continue; + + recursiveDep(*dep, listDep, libStack); dep->allDep = listDep; lib.setWinApi(lib.getWinApi() | dep->getWinApi()); @@ -140,6 +151,8 @@ void DependenciesScanner::recursiveDep(LibInfo &lib, QSet<LibInfo> &res) { } } } + + libStack.remove(lib.fullPath()); } void DependenciesScanner::addToWinAPI(const QString &lib, QHash<WinAPI, QSet<QString>>& res) { @@ -196,7 +209,8 @@ QSet<LibInfo> DependenciesScanner::scan(const QString &path) { return result; } - recursiveDep(info, result); + QSet<QString> stack; + recursiveDep(info, result, stack); return result; } diff --git a/Deploy/dependenciesscanner.h b/Deploy/dependenciesscanner.h index ec8a05d..b4a4122 100644 --- a/Deploy/dependenciesscanner.h +++ b/Deploy/dependenciesscanner.h @@ -38,7 +38,7 @@ private: QMultiMap<LibPriority, LibInfo> getLibsFromEnvirement(const QString& libName) const; - void recursiveDep(LibInfo& lib, QSet<LibInfo> &res); + void recursiveDep(LibInfo& lib, QSet<LibInfo> &res, QSet<QString> &libStack); void addToWinAPI(const QString& lib, QHash<WinAPI, QSet<QString> > &res); diff --git a/Deploy/deploy_global.h b/Deploy/deploy_global.h index 80ddf76..0fa5859 100644 --- a/Deploy/deploy_global.h +++ b/Deploy/deploy_global.h @@ -13,6 +13,13 @@ #define DEFAULT_COFIGURATION_FILE QString("CQtDeployer.json") #define DISTRO_DIR QString("DistributionKit") + +#ifdef Q_OS_WIN +#define ONLY_WIN_CASE_INSENSIATIVE Qt::CaseInsensitive +#else +#define ONLY_WIN_CASE_INSENSIATIVE Qt::CaseSensitive +#endif + #if defined(DEPLOY_LIBRARY) # define DEPLOYSHARED_EXPORT Q_DECL_EXPORT #else diff --git a/Deploy/deploycore.cpp b/Deploy/deploycore.cpp index 652c3fb..4c608ca 100644 --- a/Deploy/deploycore.cpp +++ b/Deploy/deploycore.cpp @@ -342,7 +342,7 @@ QString DeployCore::findProcess(const QString &env, const QString& proc) { auto files = QDir(path).entryInfoList(QDir::NoDotAndDotDot | QDir::Files); for (const auto& bin : files) { - if (bin.fileName().compare(proc, ONLY_WIN_CASE_INSENSIATIVE) == 0) { + if (bin.baseName().compare(proc, ONLY_WIN_CASE_INSENSIATIVE) == 0) { return bin.absoluteFilePath(); } } diff --git a/Deploy/pathutils.h b/Deploy/pathutils.h index 3ada5fd..0b3741c 100644 --- a/Deploy/pathutils.h +++ b/Deploy/pathutils.h @@ -13,12 +13,6 @@ #include <QString> #include "deploy_global.h" -#ifdef Q_OS_WIN -#define ONLY_WIN_CASE_INSENSIATIVE Qt::CaseInsensitive -#else -#define ONLY_WIN_CASE_INSENSIATIVE Qt::CaseSensitive -#endif - /** * @brief The PathUtils class * diff --git a/Deploy/pe.cpp b/Deploy/pe.cpp index f43c362..0d43166 100644 --- a/Deploy/pe.cpp +++ b/Deploy/pe.cpp @@ -48,8 +48,6 @@ struct parsed_pe_internal { bool PE::getDep(peparse::parsed_pe_internal * internal, LibInfo &res) const { auto imports = internal->imports; - auto exports = internal->exports; - std::set<std::string> filter; for ( auto &i : imports) { @@ -59,13 +57,6 @@ bool PE::getDep(peparse::parsed_pe_internal * internal, LibInfo &res) const { } } - for ( auto &i : exports) { - if (!filter.count(i.moduleName)) { - filter.insert(i.moduleName); - res.addDependncies(QString::fromStdString(i.moduleName)); - } - } - if (res.getWinApi() != WinAPI::NoWinAPI) { res.addDependncies(_winAPI.value(res.getWinApi())); } diff --git a/QIFData/installerCQtDeployer.pri b/QIFData/installerCQtDeployer.pri index cc3e1bc..4acdf9f 100644 --- a/QIFData/installerCQtDeployer.pri +++ b/QIFData/installerCQtDeployer.pri @@ -34,10 +34,7 @@ deploy.depends += deployOffline win32:ONLINE_REPO_DIR = $$ONLINE/CQtDeployer/Windows unix:ONLINE_REPO_DIR = $$ONLINE/CQtDeployer/Linux -create_repo.commands = $$REPOGEN \ - --update-new-components \ - -p $$PWD/packages \ - $$ONLINE_REPO_DIR +create_repo.commands = python3 $$PWD/QuasarAppScripts/cp.py $$PWD/packages/ $$PWD/../Repo chmodSnap.commands = chmod 777 -R $$DATA_DIR unix:deploy.depends += chmodSnap diff --git a/QIFData/packages/cqtdeployer_1_4/meta/installscript.js b/QIFData/packages/cqtdeployer_1_4/meta/installscript.js index c070bd8..9580dcd 100644 --- a/QIFData/packages/cqtdeployer_1_4/meta/installscript.js +++ b/QIFData/packages/cqtdeployer_1_4/meta/installscript.js @@ -31,7 +31,7 @@ function systemIntegration() { if (systemInfo.kernelType === "winnt") { component.addOperation('Execute', ["SETX", "cqtdeployer", "\"" + targetDir + "/" + VERSION + "/cqtdeployer.exe\""]) - + component.addElevatedOperation('CreateLink', [ "C:/Windows/system32/cqtdeployer", "\"" + targetDir + "/" + VERSION + "/cqtdeployer.exe\""]) } else { diff --git a/QuasarAppScripts b/QuasarAppScripts new file mode 160000 index 0000000..f680b27 --- /dev/null +++ b/QuasarAppScripts @@ -0,0 +1 @@ +Subproject commit f680b277968f6bbd966a7dcfe2014dbb343fefd2 diff --git a/UnitTests/modulesqt513.cpp b/UnitTests/modulesqt513.cpp index 1afd1a7..e1a7970 100644 --- a/UnitTests/modulesqt513.cpp +++ b/UnitTests/modulesqt513.cpp @@ -2688,7 +2688,625 @@ QSet<QString> ModulesQt513::separetedPackageslibs() "./" + DISTRO_DIR + "/package2/translations/qtdeclarative_uk.qm" }); #else - auto tree = utils.createTree({}); + auto tree = utils.createTree({ + "./" + DISTRO_DIR + "/QtWidgetsProject.bat", + "./" + DISTRO_DIR + "/lol/QtWidgetsProject.exe", + "./" + DISTRO_DIR + "/lol/qt.conf", + "./" + DISTRO_DIR + "/lolLib/Qt5Core.dll", + "./" + DISTRO_DIR + "/lolLib/Qt5Gui.dll", + "./" + DISTRO_DIR + "/lolLib/Qt5Network.dll", + "./" + DISTRO_DIR + "/lolLib/Qt5Qml.dll", + "./" + DISTRO_DIR + "/lolLib/Qt5Quick.dll", + "./" + DISTRO_DIR + "/lolLib/Qt5Svg.dll", + "./" + DISTRO_DIR + "/lolLib/Qt5VirtualKeyboard.dll", + "./" + DISTRO_DIR + "/lolLib/Qt5WebSockets.dll", + "./" + DISTRO_DIR + "/lolLib/Qt5Widgets.dll", + "./" + DISTRO_DIR + "/lolLib/libgcc_s_seh-1.dll", + "./" + DISTRO_DIR + "/lolLib/libstdc++-6.dll", + "./" + DISTRO_DIR + "/lolLib/libwinpthread-1.dll", + "./" + DISTRO_DIR + "/lolTr/qtbase_ar.qm", + "./" + DISTRO_DIR + "/lolTr/qtbase_bg.qm", + "./" + DISTRO_DIR + "/lolTr/qtbase_ca.qm", + "./" + DISTRO_DIR + "/lolTr/qtbase_cs.qm", + "./" + DISTRO_DIR + "/lolTr/qtbase_da.qm", + "./" + DISTRO_DIR + "/lolTr/qtbase_de.qm", + "./" + DISTRO_DIR + "/lolTr/qtbase_en.qm", + "./" + DISTRO_DIR + "/lolTr/qtbase_es.qm", + "./" + DISTRO_DIR + "/lolTr/qtbase_fi.qm", + "./" + DISTRO_DIR + "/lolTr/qtbase_fr.qm", + "./" + DISTRO_DIR + "/lolTr/qtbase_gd.qm", + "./" + DISTRO_DIR + "/lolTr/qtbase_he.qm", + "./" + DISTRO_DIR + "/lolTr/qtbase_hu.qm", + "./" + DISTRO_DIR + "/lolTr/qtbase_it.qm", + "./" + DISTRO_DIR + "/lolTr/qtbase_ja.qm", + "./" + DISTRO_DIR + "/lolTr/qtbase_ko.qm", + "./" + DISTRO_DIR + "/lolTr/qtbase_lv.qm", + "./" + DISTRO_DIR + "/lolTr/qtbase_pl.qm", + "./" + DISTRO_DIR + "/lolTr/qtbase_ru.qm", + "./" + DISTRO_DIR + "/lolTr/qtbase_sk.qm", + "./" + DISTRO_DIR + "/lolTr/qtbase_uk.qm", + "./" + DISTRO_DIR + "/lolTr/qtbase_zh_TW.qm", + "./" + DISTRO_DIR + "/lolTr/qtdeclarative_bg.qm", + "./" + DISTRO_DIR + "/lolTr/qtdeclarative_da.qm", + "./" + DISTRO_DIR + "/lolTr/qtdeclarative_de.qm", + "./" + DISTRO_DIR + "/lolTr/qtdeclarative_en.qm", + "./" + DISTRO_DIR + "/lolTr/qtdeclarative_es.qm", + "./" + DISTRO_DIR + "/lolTr/qtdeclarative_fi.qm", + "./" + DISTRO_DIR + "/lolTr/qtdeclarative_fr.qm", + "./" + DISTRO_DIR + "/lolTr/qtdeclarative_hu.qm", + "./" + DISTRO_DIR + "/lolTr/qtdeclarative_ja.qm", + "./" + DISTRO_DIR + "/lolTr/qtdeclarative_ko.qm", + "./" + DISTRO_DIR + "/lolTr/qtdeclarative_lv.qm", + "./" + DISTRO_DIR + "/lolTr/qtdeclarative_pl.qm", + "./" + DISTRO_DIR + "/lolTr/qtdeclarative_ru.qm", + "./" + DISTRO_DIR + "/lolTr/qtdeclarative_sk.qm", + "./" + DISTRO_DIR + "/lolTr/qtdeclarative_uk.qm", + "./" + DISTRO_DIR + "/p/iconengines/qsvgicon.dll", + "./" + DISTRO_DIR + "/p/imageformats/qgif.dll", + "./" + DISTRO_DIR + "/p/imageformats/qicns.dll", + "./" + DISTRO_DIR + "/p/imageformats/qico.dll", + "./" + DISTRO_DIR + "/p/imageformats/qjpeg.dll", + "./" + DISTRO_DIR + "/p/imageformats/qsvg.dll", + "./" + DISTRO_DIR + "/p/imageformats/qtga.dll", + "./" + DISTRO_DIR + "/p/imageformats/qtiff.dll", + "./" + DISTRO_DIR + "/p/imageformats/qwbmp.dll", + "./" + DISTRO_DIR + "/p/imageformats/qwebp.dll", + "./" + DISTRO_DIR + "/p/platforminputcontexts/qtvirtualkeyboardplugin.dll", + "./" + DISTRO_DIR + "/p/platforms/qminimal.dll", + "./" + DISTRO_DIR + "/p/platforms/qoffscreen.dll", + "./" + DISTRO_DIR + "/p/platforms/qwebgl.dll", + "./" + DISTRO_DIR + "/p/platforms/qwindows.dll", + "./" + DISTRO_DIR + "/p/styles/qwindowsvistastyle.dll", + "./" + DISTRO_DIR + "/p/virtualkeyboard/qtvirtualkeyboard_hangul.dll", + "./" + DISTRO_DIR + "/p/virtualkeyboard/qtvirtualkeyboard_openwnn.dll", + "./" + DISTRO_DIR + "/p/virtualkeyboard/qtvirtualkeyboard_pinyin.dll", + "./" + DISTRO_DIR + "/p/virtualkeyboard/qtvirtualkeyboard_tcime.dll", + "./" + DISTRO_DIR + "/p/virtualkeyboard/qtvirtualkeyboard_thai.dll", + "./" + DISTRO_DIR + "/package1/TestOnlyC.exe", + "./" + DISTRO_DIR + "/package1/libgcc_s_seh-1.dll", + "./" + DISTRO_DIR + "/package1/libstdc++-6.dll", + "./" + DISTRO_DIR + "/package1/libwinpthread-1.dll", + "./" + DISTRO_DIR + "/package1/qt.conf", + "./" + DISTRO_DIR + "/package2/Qt5Core.dll", + "./" + DISTRO_DIR + "/package2/Qt5Gui.dll", + "./" + DISTRO_DIR + "/package2/Qt5Network.dll", + "./" + DISTRO_DIR + "/package2/Qt5Qml.dll", + "./" + DISTRO_DIR + "/package2/Qt5Quick.dll", + "./" + DISTRO_DIR + "/package2/Qt5QuickControls2.dll", + "./" + DISTRO_DIR + "/package2/Qt5QuickTemplates2.dll", + "./" + DISTRO_DIR + "/package2/Qt5Svg.dll", + "./" + DISTRO_DIR + "/package2/Qt5VirtualKeyboard.dll", + "./" + DISTRO_DIR + "/package2/Qt5WebSockets.dll", + "./" + DISTRO_DIR + "/package2/Qt5Widgets.dll", + "./" + DISTRO_DIR + "/package2/TestQMLWidgets.exe", + "./" + DISTRO_DIR + "/package2/libgcc_s_seh-1.dll", + "./" + DISTRO_DIR + "/package2/libstdc++-6.dll", + "./" + DISTRO_DIR + "/package2/libwinpthread-1.dll", + "./" + DISTRO_DIR + "/package2/plugins/bearer/qgenericbearer.dll", + "./" + DISTRO_DIR + "/package2/plugins/iconengines/qsvgicon.dll", + "./" + DISTRO_DIR + "/package2/plugins/imageformats/qgif.dll", + "./" + DISTRO_DIR + "/package2/plugins/imageformats/qicns.dll", + "./" + DISTRO_DIR + "/package2/plugins/imageformats/qico.dll", + "./" + DISTRO_DIR + "/package2/plugins/imageformats/qjpeg.dll", + "./" + DISTRO_DIR + "/package2/plugins/imageformats/qsvg.dll", + "./" + DISTRO_DIR + "/package2/plugins/imageformats/qtga.dll", + "./" + DISTRO_DIR + "/package2/plugins/imageformats/qtiff.dll", + "./" + DISTRO_DIR + "/package2/plugins/imageformats/qwbmp.dll", + "./" + DISTRO_DIR + "/package2/plugins/imageformats/qwebp.dll", + "./" + DISTRO_DIR + "/package2/plugins/platforminputcontexts/qtvirtualkeyboardplugin.dll", + "./" + DISTRO_DIR + "/package2/plugins/platforms/qminimal.dll", + "./" + DISTRO_DIR + "/package2/plugins/platforms/qoffscreen.dll", + "./" + DISTRO_DIR + "/package2/plugins/platforms/qwebgl.dll", + "./" + DISTRO_DIR + "/package2/plugins/platforms/qwindows.dll", + "./" + DISTRO_DIR + "/package2/plugins/virtualkeyboard/qtvirtualkeyboard_hangul.dll", + "./" + DISTRO_DIR + "/package2/plugins/virtualkeyboard/qtvirtualkeyboard_openwnn.dll", + "./" + DISTRO_DIR + "/package2/plugins/virtualkeyboard/qtvirtualkeyboard_pinyin.dll", + "./" + DISTRO_DIR + "/package2/plugins/virtualkeyboard/qtvirtualkeyboard_tcime.dll", + "./" + DISTRO_DIR + "/package2/plugins/virtualkeyboard/qtvirtualkeyboard_thai.dll", + "./" + DISTRO_DIR + "/package2/qml/QtGraphicalEffects/Blend.qml", + "./" + DISTRO_DIR + "/package2/qml/QtGraphicalEffects/BrightnessContrast.qml", + "./" + DISTRO_DIR + "/package2/qml/QtGraphicalEffects/ColorOverlay.qml", + "./" + DISTRO_DIR + "/package2/qml/QtGraphicalEffects/Colorize.qml", + "./" + DISTRO_DIR + "/package2/qml/QtGraphicalEffects/ConicalGradient.qml", + "./" + DISTRO_DIR + "/package2/qml/QtGraphicalEffects/Desaturate.qml", + "./" + DISTRO_DIR + "/package2/qml/QtGraphicalEffects/DirectionalBlur.qml", + "./" + DISTRO_DIR + "/package2/qml/QtGraphicalEffects/Displace.qml", + "./" + DISTRO_DIR + "/package2/qml/QtGraphicalEffects/DropShadow.qml", + "./" + DISTRO_DIR + "/package2/qml/QtGraphicalEffects/FastBlur.qml", + "./" + DISTRO_DIR + "/package2/qml/QtGraphicalEffects/GammaAdjust.qml", + "./" + DISTRO_DIR + "/package2/qml/QtGraphicalEffects/GaussianBlur.qml", + "./" + DISTRO_DIR + "/package2/qml/QtGraphicalEffects/Glow.qml", + "./" + DISTRO_DIR + "/package2/qml/QtGraphicalEffects/HueSaturation.qml", + "./" + DISTRO_DIR + "/package2/qml/QtGraphicalEffects/InnerShadow.qml", + "./" + DISTRO_DIR + "/package2/qml/QtGraphicalEffects/LevelAdjust.qml", + "./" + DISTRO_DIR + "/package2/qml/QtGraphicalEffects/LinearGradient.qml", + "./" + DISTRO_DIR + "/package2/qml/QtGraphicalEffects/MaskedBlur.qml", + "./" + DISTRO_DIR + "/package2/qml/QtGraphicalEffects/OpacityMask.qml", + "./" + DISTRO_DIR + "/package2/qml/QtGraphicalEffects/RadialBlur.qml", + "./" + DISTRO_DIR + "/package2/qml/QtGraphicalEffects/RadialGradient.qml", + "./" + DISTRO_DIR + "/package2/qml/QtGraphicalEffects/RectangularGlow.qml", + "./" + DISTRO_DIR + "/package2/qml/QtGraphicalEffects/RecursiveBlur.qml", + "./" + DISTRO_DIR + "/package2/qml/QtGraphicalEffects/ThresholdMask.qml", + "./" + DISTRO_DIR + "/package2/qml/QtGraphicalEffects/ZoomBlur.qml", + "./" + DISTRO_DIR + "/package2/qml/QtGraphicalEffects/plugins.qmltypes", + "./" + DISTRO_DIR + "/package2/qml/QtGraphicalEffects/private/DropShadowBase.qml", + "./" + DISTRO_DIR + "/package2/qml/QtGraphicalEffects/private/DropShadowBase.qmlc", + "./" + DISTRO_DIR + "/package2/qml/QtGraphicalEffects/private/FastGlow.qml", + "./" + DISTRO_DIR + "/package2/qml/QtGraphicalEffects/private/FastGlow.qmlc", + "./" + DISTRO_DIR + "/package2/qml/QtGraphicalEffects/private/FastInnerShadow.qml", + "./" + DISTRO_DIR + "/package2/qml/QtGraphicalEffects/private/FastInnerShadow.qmlc", + "./" + DISTRO_DIR + "/package2/qml/QtGraphicalEffects/private/FastMaskedBlur.qml", + "./" + DISTRO_DIR + "/package2/qml/QtGraphicalEffects/private/FastMaskedBlur.qmlc", + "./" + DISTRO_DIR + "/package2/qml/QtGraphicalEffects/private/GaussianDirectionalBlur.qml", + "./" + DISTRO_DIR + "/package2/qml/QtGraphicalEffects/private/GaussianDirectionalBlur.qmlc", + "./" + DISTRO_DIR + "/package2/qml/QtGraphicalEffects/private/GaussianGlow.qml", + "./" + DISTRO_DIR + "/package2/qml/QtGraphicalEffects/private/GaussianGlow.qmlc", + "./" + DISTRO_DIR + "/package2/qml/QtGraphicalEffects/private/GaussianInnerShadow.qml", + "./" + DISTRO_DIR + "/package2/qml/QtGraphicalEffects/private/GaussianInnerShadow.qmlc", + "./" + DISTRO_DIR + "/package2/qml/QtGraphicalEffects/private/GaussianMaskedBlur.qml", + "./" + DISTRO_DIR + "/package2/qml/QtGraphicalEffects/private/GaussianMaskedBlur.qmlc", + "./" + DISTRO_DIR + "/package2/qml/QtGraphicalEffects/private/qmldir", + "./" + DISTRO_DIR + "/package2/qml/QtGraphicalEffects/private/qtgraphicaleffectsprivate.dll", + "./" + DISTRO_DIR + "/package2/qml/QtGraphicalEffects/qmldir", + "./" + DISTRO_DIR + "/package2/qml/QtGraphicalEffects/qtgraphicaleffectsplugin.dll", + "./" + DISTRO_DIR + "/package2/qml/QtQuick.2/plugins.qmltypes", + "./" + DISTRO_DIR + "/package2/qml/QtQuick.2/qmldir", + "./" + DISTRO_DIR + "/package2/qml/QtQuick.2/qtquick2plugin.dll", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/AbstractButton.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Action.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/ActionGroup.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/ApplicationWindow.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/BusyIndicator.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Button.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/ButtonGroup.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/CheckBox.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/CheckDelegate.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/ComboBox.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Container.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Control.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/DelayButton.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Dial.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Dialog.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/DialogButtonBox.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Drawer.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Frame.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Fusion/ApplicationWindow.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Fusion/BusyIndicator.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Fusion/Button.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Fusion/ButtonPanel.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Fusion/CheckBox.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Fusion/CheckDelegate.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Fusion/CheckIndicator.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Fusion/ComboBox.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Fusion/DelayButton.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Fusion/Dial.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Fusion/Dialog.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Fusion/DialogButtonBox.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Fusion/Drawer.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Fusion/Frame.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Fusion/GroupBox.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Fusion/ItemDelegate.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Fusion/Label.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Fusion/Menu.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Fusion/MenuBar.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Fusion/MenuBarItem.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Fusion/MenuItem.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Fusion/MenuSeparator.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Fusion/Page.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Fusion/PageIndicator.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Fusion/Pane.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Fusion/Popup.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Fusion/ProgressBar.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Fusion/RadioButton.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Fusion/RadioDelegate.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Fusion/RadioIndicator.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Fusion/RangeSlider.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Fusion/RoundButton.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Fusion/ScrollBar.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Fusion/ScrollIndicator.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Fusion/Slider.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Fusion/SliderGroove.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Fusion/SliderHandle.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Fusion/SpinBox.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Fusion/SplitView.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Fusion/SwipeDelegate.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Fusion/Switch.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Fusion/SwitchDelegate.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Fusion/SwitchIndicator.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Fusion/TabBar.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Fusion/TabButton.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Fusion/TextArea.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Fusion/TextField.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Fusion/ToolBar.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Fusion/ToolButton.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Fusion/ToolSeparator.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Fusion/ToolTip.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Fusion/Tumbler.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Fusion/plugins.qmltypes", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Fusion/qmldir", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Fusion/qtquickcontrols2fusionstyleplugin.dll", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/GroupBox.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Imagine/ApplicationWindow.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Imagine/BusyIndicator.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Imagine/Button.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Imagine/CheckBox.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Imagine/CheckDelegate.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Imagine/ComboBox.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Imagine/DelayButton.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Imagine/Dial.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Imagine/Dialog.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Imagine/DialogButtonBox.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Imagine/Drawer.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Imagine/Frame.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Imagine/GroupBox.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Imagine/ItemDelegate.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Imagine/Label.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Imagine/Menu.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Imagine/MenuItem.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Imagine/MenuSeparator.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Imagine/Page.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Imagine/PageIndicator.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Imagine/Pane.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Imagine/Popup.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Imagine/ProgressBar.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Imagine/RadioButton.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Imagine/RadioDelegate.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Imagine/RangeSlider.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Imagine/RoundButton.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Imagine/ScrollBar.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Imagine/ScrollIndicator.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Imagine/Slider.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Imagine/SpinBox.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Imagine/SplitView.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Imagine/StackView.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Imagine/SwipeDelegate.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Imagine/SwipeView.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Imagine/Switch.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Imagine/SwitchDelegate.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Imagine/TabBar.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Imagine/TabButton.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Imagine/TextArea.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Imagine/TextField.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Imagine/ToolBar.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Imagine/ToolButton.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Imagine/ToolSeparator.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Imagine/ToolTip.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Imagine/Tumbler.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Imagine/plugins.qmltypes", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Imagine/qmldir", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Imagine/qtquickcontrols2imaginestyleplugin.dll", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/ItemDelegate.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Label.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Material/ApplicationWindow.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Material/BoxShadow.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Material/BusyIndicator.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Material/Button.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Material/CheckBox.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Material/CheckDelegate.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Material/CheckIndicator.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Material/ComboBox.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Material/CursorDelegate.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Material/DelayButton.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Material/Dial.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Material/Dialog.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Material/DialogButtonBox.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Material/Drawer.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Material/ElevationEffect.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Material/Frame.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Material/GroupBox.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Material/ItemDelegate.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Material/Label.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Material/Menu.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Material/MenuBar.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Material/MenuBarItem.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Material/MenuItem.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Material/MenuSeparator.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Material/Page.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Material/PageIndicator.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Material/Pane.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Material/Popup.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Material/ProgressBar.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Material/RadioButton.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Material/RadioDelegate.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Material/RadioIndicator.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Material/RangeSlider.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Material/RectangularGlow.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Material/RoundButton.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Material/ScrollBar.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Material/ScrollIndicator.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Material/Slider.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Material/SliderHandle.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Material/SpinBox.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Material/SplitView.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Material/StackView.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Material/SwipeDelegate.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Material/SwipeView.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Material/Switch.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Material/SwitchDelegate.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Material/SwitchIndicator.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Material/TabBar.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Material/TabButton.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Material/TextArea.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Material/TextField.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Material/ToolBar.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Material/ToolButton.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Material/ToolSeparator.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Material/ToolTip.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Material/Tumbler.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Material/plugins.qmltypes", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Material/qmldir", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Material/qtquickcontrols2materialstyleplugin.dll", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Menu.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/MenuBar.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/MenuBarItem.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/MenuItem.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/MenuSeparator.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Page.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/PageIndicator.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Pane.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Popup.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/ProgressBar.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/RadioButton.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/RadioDelegate.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/RangeSlider.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/RoundButton.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/ScrollBar.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/ScrollIndicator.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/ScrollView.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Slider.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/SpinBox.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/SplitView.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/StackView.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/SwipeDelegate.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/SwipeView.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Switch.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/SwitchDelegate.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/TabBar.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/TabButton.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/TextArea.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/TextField.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/ToolBar.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/ToolButton.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/ToolSeparator.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/ToolTip.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Tumbler.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Universal/ApplicationWindow.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Universal/BusyIndicator.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Universal/Button.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Universal/CheckBox.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Universal/CheckDelegate.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Universal/CheckIndicator.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Universal/ComboBox.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Universal/DelayButton.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Universal/Dial.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Universal/Dialog.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Universal/DialogButtonBox.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Universal/Drawer.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Universal/Frame.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Universal/GroupBox.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Universal/ItemDelegate.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Universal/Label.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Universal/Menu.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Universal/MenuBar.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Universal/MenuBarItem.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Universal/MenuItem.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Universal/MenuSeparator.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Universal/Page.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Universal/PageIndicator.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Universal/Pane.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Universal/Popup.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Universal/ProgressBar.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Universal/RadioButton.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Universal/RadioDelegate.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Universal/RadioIndicator.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Universal/RangeSlider.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Universal/RoundButton.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Universal/ScrollBar.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Universal/ScrollIndicator.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Universal/Slider.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Universal/SpinBox.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Universal/SplitView.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Universal/StackView.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Universal/SwipeDelegate.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Universal/Switch.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Universal/SwitchDelegate.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Universal/SwitchIndicator.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Universal/TabBar.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Universal/TabButton.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Universal/TextArea.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Universal/TextField.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Universal/ToolBar.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Universal/ToolButton.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Universal/ToolSeparator.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Universal/ToolTip.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Universal/Tumbler.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Universal/plugins.qmltypes", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Universal/qmldir", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/Universal/qtquickcontrols2universalstyleplugin.dll", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/AbstractButtonSection.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/BusyIndicatorSpecifics.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/ButtonSection.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/ButtonSpecifics.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/CheckBoxSpecifics.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/CheckDelegateSpecifics.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/CheckSection.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/ComboBoxSpecifics.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/ContainerSection.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/ControlSection.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/ControlSpecifics.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/DelayButtonSpecifics.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/DialSpecifics.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/FrameSpecifics.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/GroupBoxSpecifics.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/ItemDelegateSection.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/ItemDelegateSpecifics.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/LabelSpecifics.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/PaddingSection.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/PageIndicatorSpecifics.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/PageSpecifics.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/PaneSection.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/PaneSpecifics.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/ProgressBarSpecifics.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/RadioButtonSpecifics.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/RadioDelegateSpecifics.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/RangeSliderSpecifics.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/RoundButtonSpecifics.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/ScrollViewSpecifics.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/SliderSpecifics.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/SpinBoxSpecifics.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/StackViewSpecifics.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/SwipeDelegateSpecifics.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/SwipeViewSpecifics.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/SwitchDelegateSpecifics.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/SwitchSpecifics.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/TabBarSpecifics.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/TabButtonSpecifics.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/TextAreaSpecifics.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/TextFieldSpecifics.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/ToolBarSpecifics.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/ToolButtonSpecifics.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/ToolSeparatorSpecifics.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/TumblerSpecifics.qml", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/busyindicator-icon.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/busyindicator-icon16.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/busyindicator-icon@2x.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/button-icon.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/button-icon16.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/button-icon@2x.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/checkbox-icon.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/checkbox-icon16.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/checkbox-icon@2x.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/combobox-icon.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/combobox-icon16.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/combobox-icon@2x.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/delaybutton-icon.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/delaybutton-icon16.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/delaybutton-icon@2x.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/dial-icon.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/dial-icon16.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/dial-icon@2x.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/frame-icon.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/frame-icon16.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/frame-icon@2x.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/groupbox-icon.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/groupbox-icon16.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/groupbox-icon@2x.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/itemdelegate-icon.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/itemdelegate-icon16.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/itemdelegate-icon@2x.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/label-icon.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/label-icon16.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/label-icon@2x.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/page-icon.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/page-icon16.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/page-icon@2x.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/pageindicator-icon.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/pageindicator-icon16.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/pageindicator-icon@2x.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/pane-icon.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/pane-icon16.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/pane-icon@2x.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/progressbar-icon.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/progressbar-icon16.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/progressbar-icon@2x.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/radiobutton-icon.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/radiobutton-icon16.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/radiobutton-icon@2x.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/rangeslider-icon.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/rangeslider-icon16.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/rangeslider-icon@2x.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/roundbutton-icon.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/roundbutton-icon16.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/roundbutton-icon@2x.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/scrollview-icon.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/scrollview-icon16.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/scrollview-icon@2x.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/slider-icon.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/slider-icon16.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/slider-icon@2x.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/spinbox-icon.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/spinbox-icon16.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/spinbox-icon@2x.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/stackview-icon.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/stackview-icon16.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/stackview-icon@2x.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/swipeview-icon.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/swipeview-icon16.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/swipeview-icon@2x.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/switch-icon.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/switch-icon16.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/switch-icon@2x.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/textarea-icon.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/textarea-icon16.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/textarea-icon@2x.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/textfield-icon.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/textfield-icon16.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/textfield-icon@2x.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/toolbar-icon.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/toolbar-icon16.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/toolbar-icon@2x.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/toolbutton-icon.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/toolbutton-icon16.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/toolbutton-icon@2x.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/toolseparator-icon.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/toolseparator-icon16.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/toolseparator-icon@2x.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/tumbler-icon.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/tumbler-icon16.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/images/tumbler-icon@2x.png", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/designer/qtquickcontrols2.metainfo", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/plugins.qmltypes", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/qmldir", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Controls.2/qtquickcontrols2plugin.dll", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Layouts/plugins.qmltypes", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Layouts/qmldir", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Layouts/qquicklayoutsplugin.dll", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Templates.2/plugins.qmltypes", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Templates.2/qmldir", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Templates.2/qtquicktemplates2plugin.dll", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Window.2/plugins.qmltypes", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Window.2/qmldir", + "./" + DISTRO_DIR + "/package2/qml/QtQuick/Window.2/windowplugin.dll", + "./" + DISTRO_DIR + "/package2/qt.conf", + "./" + DISTRO_DIR + "/package2/translations/qtbase_ar.qm", + "./" + DISTRO_DIR + "/package2/translations/qtbase_bg.qm", + "./" + DISTRO_DIR + "/package2/translations/qtbase_ca.qm", + "./" + DISTRO_DIR + "/package2/translations/qtbase_cs.qm", + "./" + DISTRO_DIR + "/package2/translations/qtbase_da.qm", + "./" + DISTRO_DIR + "/package2/translations/qtbase_de.qm", + "./" + DISTRO_DIR + "/package2/translations/qtbase_en.qm", + "./" + DISTRO_DIR + "/package2/translations/qtbase_es.qm", + "./" + DISTRO_DIR + "/package2/translations/qtbase_fi.qm", + "./" + DISTRO_DIR + "/package2/translations/qtbase_fr.qm", + "./" + DISTRO_DIR + "/package2/translations/qtbase_gd.qm", + "./" + DISTRO_DIR + "/package2/translations/qtbase_he.qm", + "./" + DISTRO_DIR + "/package2/translations/qtbase_hu.qm", + "./" + DISTRO_DIR + "/package2/translations/qtbase_it.qm", + "./" + DISTRO_DIR + "/package2/translations/qtbase_ja.qm", + "./" + DISTRO_DIR + "/package2/translations/qtbase_ko.qm", + "./" + DISTRO_DIR + "/package2/translations/qtbase_lv.qm", + "./" + DISTRO_DIR + "/package2/translations/qtbase_pl.qm", + "./" + DISTRO_DIR + "/package2/translations/qtbase_ru.qm", + "./" + DISTRO_DIR + "/package2/translations/qtbase_sk.qm", + "./" + DISTRO_DIR + "/package2/translations/qtbase_uk.qm", + "./" + DISTRO_DIR + "/package2/translations/qtbase_zh_TW.qm", + "./" + DISTRO_DIR + "/package2/translations/qtdeclarative_bg.qm", + "./" + DISTRO_DIR + "/package2/translations/qtdeclarative_da.qm", + "./" + DISTRO_DIR + "/package2/translations/qtdeclarative_de.qm", + "./" + DISTRO_DIR + "/package2/translations/qtdeclarative_en.qm", + "./" + DISTRO_DIR + "/package2/translations/qtdeclarative_es.qm", + "./" + DISTRO_DIR + "/package2/translations/qtdeclarative_fi.qm", + "./" + DISTRO_DIR + "/package2/translations/qtdeclarative_fr.qm", + "./" + DISTRO_DIR + "/package2/translations/qtdeclarative_hu.qm", + "./" + DISTRO_DIR + "/package2/translations/qtdeclarative_ja.qm", + "./" + DISTRO_DIR + "/package2/translations/qtdeclarative_ko.qm", + "./" + DISTRO_DIR + "/package2/translations/qtdeclarative_lv.qm", + "./" + DISTRO_DIR + "/package2/translations/qtdeclarative_pl.qm", + "./" + DISTRO_DIR + "/package2/translations/qtdeclarative_ru.qm", + "./" + DISTRO_DIR + "/package2/translations/qtdeclarative_sk.qm", + "./" + DISTRO_DIR + "/package2/translations/qtdeclarative_uk.qm" + } +); #endif return tree; } diff --git a/UnitTests/modulesqt514.cpp b/UnitTests/modulesqt514.cpp index 155c357..784c010 100644 --- a/UnitTests/modulesqt514.cpp +++ b/UnitTests/modulesqt514.cpp @@ -19,6 +19,9 @@ QSet<QString> ModulesQt514::qtLibs() auto res = ModulesQt513::qtLibs(); #ifdef Q_OS_WIN + res += utils.createTree({ + {"./" + DISTRO_DIR + "/Qt5QmlModels.dll"}, + }); #else res += utils.createTree({ {"./" + DISTRO_DIR + "/lib/libQt5QmlModels.so"}, @@ -37,6 +40,10 @@ QSet<QString> ModulesQt514::qmlLibs() auto res = ModulesQt513::qmlLibs(); #ifdef Q_OS_WIN + res += utils.createTree({ + {"./" + DISTRO_DIR + "/Qt5QmlModels.dll"}, + {"./" + DISTRO_DIR + "/Qt5QmlWorkerScript.dll"}, + }); #else res += utils.createTree({ {"./" + DISTRO_DIR + "/lib/libQt5QmlModels.so"}, @@ -61,6 +68,13 @@ QSet<QString> ModulesQt514::separetedPackageslibs() auto res = ModulesQt513::separetedPackageslibs(); #ifdef Q_OS_WIN + res += utils.createTree( + { + "./" + DISTRO_DIR + "/lolLib/Qt5QmlModels.dll", + "./" + DISTRO_DIR + "/package2/Qt5QmlModels.dll", + "./" + DISTRO_DIR + "/package2/Qt5QmlWorkerScript.dll", + } + ); #else res += utils.createTree( { @@ -84,6 +98,10 @@ QSet<QString> ModulesQt514::outTestLibs() auto res = ModulesQt513::outTestLibs(); #ifdef Q_OS_WIN + res += utils.createTree({ + "./" + DISTRO_DIR + "/lolLib/Qt5QmlModels.dll", + "./" + DISTRO_DIR + "/lolLib/Qt5QmlWorkerScript.dll", + }); #else res += utils.createTree({ "./" + DISTRO_DIR + "/lolLib/libQt5QmlModels.so", @@ -102,6 +120,9 @@ QSet<QString> ModulesQt514::qtWithoutTr() auto res = ModulesQt513::qtWithoutTr(); #ifdef Q_OS_WIN + res += utils.createTree({ + {"./" + DISTRO_DIR + "/Qt5QmlModels.dll"}, + }); #else res += utils.createTree({ {"./" + DISTRO_DIR + "/lib/libQt5QmlModels.so"}, diff --git a/UnitTests/tst_deploytest.cpp b/UnitTests/tst_deploytest.cpp index 512768d..7a86f6a 100644 --- a/UnitTests/tst_deploytest.cpp +++ b/UnitTests/tst_deploytest.cpp @@ -881,7 +881,8 @@ void deploytest::runTestParams(const QStringList &list, QSet<QString>* tree, QuasarAppUtils::Params::parseParams(list); Deploy deploy; - QVERIFY(deploy.run() == Good); + if (deploy.run() != Good) + QVERIFY(false); if (tree) { checkResults(*tree, noWarnings, onlySize); @@ -1358,7 +1359,7 @@ void deploytest::testConfFile() { bin = target1; runTestParams({"-bin", bin, "force-clear", - "-targetPackage", "package;Test", + "-targetPackage", "package;TestOn", "-confFile", TestBinDir + "/../folder/For/Testing/Deploy/File/TestConf.json"}, &comapareTree); runTestParams({"-confFile", TestBinDir + "/../folder/For/Testing/Deploy/File/TestConf.json"}, @@ -1393,7 +1394,7 @@ void deploytest::testPackages() { QString bin = target1; runTestParams({"-bin", bin, "force-clear", - "-targetPackage", "/package/;Test"}, &comapareTree); + "-targetPackage", "/package/;TestOn"}, &comapareTree); runTestParams({"-bin", bin, "force-clear", "-targetPackage", "/package/;" + QFileInfo(target1).absoluteFilePath()}, &comapareTree); @@ -1423,6 +1424,8 @@ void deploytest::testPackages() { "-qmlDir", "package2;" + TestBinDir + "/../TestQMLWidgets", "-targetPackage", packageString}, &comapareTree); +#ifdef Q_OS_UNIX + comapareTree -= utils.createTree({ "./" + DISTRO_DIR + "/package2/bin/TestQMLWidgets", "./" + DISTRO_DIR + "/package2/bin/qt.conf", @@ -1432,6 +1435,18 @@ void deploytest::testPackages() { "./" + DISTRO_DIR + "/package2/testBin/TestQMLWidgets", "./" + DISTRO_DIR + "/package2/testBin/qt.conf", }); +#else + comapareTree -= utils.createTree({ + "./" + DISTRO_DIR + "/package2/TestQMLWidgets.exe", + "./" + DISTRO_DIR + "/package2/qt.conf", + }); + + comapareTree += utils.createTree({ + "./" + DISTRO_DIR + "/package2/testBin/TestQMLWidgets.exe", + "./" + DISTRO_DIR + "/package2/TestQMLWidgets.bat", + "./" + DISTRO_DIR + "/package2/testBin/qt.conf", + }); +#endif runTestParams({"-bin", bin, "force-clear", "-binOut", "package2;/testBin,lol", @@ -2026,6 +2041,17 @@ void deploytest::testSystemLib() { }); + +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + comapareTree += utils.createTree( + { + "./" + DISTRO_DIR + "/d3d11.dll", + "./" + DISTRO_DIR + "/dxgi.dll", + "./" + DISTRO_DIR + "/win32u.dll", + }); +#endif + + runTestParams({"-bin", bin, "clear" , "-qmake", qmake, "deploySystem" diff --git a/installer b/installer index d59ac87..9c27310 160000 --- a/installer +++ b/installer @@ -1 +1 @@ -Subproject commit d59ac8727c0b2dbb009d43b0c1c4700cbf94d32f +Subproject commit 9c2731045d73b6f8ed83cc623d11290d53fb9e52 diff --git a/test.pri b/test.pri index 6c49227..65db5c1 100644 --- a/test.pri +++ b/test.pri @@ -7,12 +7,15 @@ contains(QMAKE_HOST.os, Linux):{ QMAKE_BIN= $$QT_DIR/qmake } -unix:deployTest.commands = cqtdeployer -bin $$exec clear -qmake $$QMAKE_BIN -targetDir $$PWD/deployTests -libDir $$PWD -recursiveDepth 4 +DEPLOYER=cqtdeployer +win32:DEPLOYER=$$(cqtdeployer) + +deployTest.commands = $$DEPLOYER -bin $$exec clear -qmake $$QMAKE_BIN -targetDir $$PWD/deployTests -libDir $$PWD -recursiveDepth 4 test.depends = deployTest unix:!android:test.commands = $$PWD/deployTests/UnitTests.sh -maxwarnings 100000 -#win32:test.commands = $$PWD/deployTests/UnitTests.exe -maxwarnings 100000 +win32:test.commands = $$PWD/deployTests/UnitTests.exe -maxwarnings 100000 -o $$PWD/buildLog.log contains(QMAKE_HOST.os, Linux):{ win32:test.commands =