QuasarApp/CQtDeployer
4
1
Fork 0
mirror of https://github.com/QuasarApp/CQtDeployer.git synced 2025-05-04 13:39:34 +00:00
Code Issues Projects Releases Wiki Activity

windows mingw tested on qt 5.12.3

Browse Source
This commit is contained in:
a.yankovich 2019-09-26 13:18:10 +03:00
parent f022ff0c4f
commit c9cffd3752
9 changed files with 690 additions and 94 deletions

21
Deploy/configparser.cpp

@ -274,7 +274,7 @@ void ConfigParser::setTargetDir(const QString &target) {
} else {
if (_config.targets.size())
_config.targetDir = QFileInfo(
_config.targets.begin().key()).absolutePath() + "/" + DISTRO_DIR;
*_config.targets.begin()).absolutePath() + "/" + DISTRO_DIR;
_config.targetDir = QFileInfo("./" + DISTRO_DIR).absoluteFilePath();
qInfo () << "flag targetDir not used." << "use default target dir :" << _config.targetDir;
@ -295,7 +295,7 @@ bool ConfigParser::setTargets(const QStringList &value) {
auto sufix = targetInfo.completeSuffix();
_config.targets.insert(QDir::fromNativeSeparators(i), sufix.isEmpty());
_config.targets.insert(QDir::fromNativeSeparators(i));
isfillList = true;
}
else if (targetInfo.isDir()) {
@ -359,7 +359,7 @@ bool ConfigParser::setBinDir(const QString &dir, bool recursive) {
name.contains(".so", Qt::CaseInsensitive) || name.contains(".exe", Qt::CaseInsensitive)) {
result = true;
_config.targets.insert(QDir::fromNativeSeparators(file.absoluteFilePath()), sufix.isEmpty());
_config.targets.insert(QDir::fromNativeSeparators(file.absoluteFilePath()));
}
@ -501,8 +501,9 @@ void ConfigParser::setExtraPath(const QStringList &value) {
}
dir.setPath(info.absoluteFilePath());
_config.extraPaths.push_back(
QDir::fromNativeSeparators(info.absoluteFilePath()));
auto extraDirs = getDirsRecursive(QDir::fromNativeSeparators(info.absoluteFilePath()), _config.depchLimit);
_config.extraPaths.append(extraDirs);
_config.envirement.addEnv(recursiveInvairement(dir), _config.appDir, _config.targetDir);
} else {
QuasarAppUtils::Params::verboseLog(i + " does not exist! and skiped");
@ -582,9 +583,9 @@ void ConfigParser::initEnvirement() {
QStringList ConfigParser::getDirsRecursive(const QString &path, int maxDepch, int depch) {
QDir dir(path);
QStringList res;
QStringList res = {path};
if (maxDepch > 0 && maxDepch < depch) {
if (maxDepch >= 0 && maxDepch <= depch) {
return res;
}
@ -600,11 +601,11 @@ QStringList ConfigParser::getDirsRecursive(const QString &path, int maxDepch, in
bool ConfigParser::smartMoveTargets() {
QMap<QString, bool> temp;
QSet<QString> temp;
bool result = true;
for (auto i = _config.targets.cbegin(); i != _config.targets.cend(); ++i) {
QFileInfo target(i.key());
QFileInfo target(*i);
QString targetPath = _config.targetDir;
@ -619,7 +620,7 @@ bool ConfigParser::smartMoveTargets() {
}
temp.insert(targetPath + "/" + target.fileName(), i.value());
temp.insert(targetPath + "/" + target.fileName());
}

2
Deploy/configparser.h

@ -39,7 +39,7 @@ struct DEPLOYSHARED_EXPORT DeployConfig {
* key - path
* value - create wrapper
*/
QMap<QString, bool> targets;
QSet<QString> targets;
Envirement envirement;
DistroStruct distroStruct;
QString translationDir;

8
Deploy/dependenciesscanner.cpp

@ -43,6 +43,12 @@ QMultiMap<LibPriority, LibInfo> DependenciesScanner::getLibsFromEnvirement(
for (auto & lib : values) {
LibInfo info;
auto priority = (DeployCore::getLibPriority(lib));
if ((priority >= SystemLib) && !QuasarAppUtils::Params::isEndable("deploySystem")) {
continue;
}
if (!fillLibInfo(info, lib)) {
QuasarAppUtils::Params::verboseLog(
"error extract lib info from " + lib + "(" + libName + ")",
@ -50,7 +56,7 @@ QMultiMap<LibPriority, LibInfo> DependenciesScanner::getLibsFromEnvirement(
continue;
}
info.setPriority(DeployCore::getLibPriority(info.fullPath()));
info.setPriority(priority);
res.insertMulti(info.getPriority(), info);
}

9
Deploy/deploycore.cpp

@ -401,12 +401,5 @@ bool DeployCore::isQtLib(const QString &lib) {
bool DeployCore::isExtraLib(const QString &lib) {
QFileInfo info(lib);
for (auto i : _config->extraPaths) {
if (info.absoluteFilePath().contains(i)) {
return true;
}
}
return false;
return _config->extraPaths.contains(info.absolutePath());
}

2
Deploy/extracter.cpp

@ -112,7 +112,7 @@ void Extracter::copyPlugins(const QStringList &list) {
void Extracter::extractAllTargets() {
for (auto i = DeployCore::_config->targets.cbegin(); i != DeployCore::_config->targets.cend(); ++i) {
extract(i.key());
extract(*i);
}
}

2
Deploy/ignorerule.cpp

@ -40,7 +40,7 @@ bool IgnoreRule::isIgnore(const LibInfo &info) const {
for (auto &ignore : _data) {
bool checkPlatform = ((ignore.platform & info.getPlatform()) == info.getPlatform()) || ignore.platform == UnknownPlatform;
bool checkPriority = ignore.prority >= info.getPriority();
bool checkPriority = (ignore.prority <= info.getPriority()) || ignore.prority == NotFile;
bool checkEnvirement = !ignore.enfirement.size() || ignore.enfirement.inThisEnvirement(info.fullPath());
if (checkPlatform && checkPriority && checkEnvirement && check(info, ignore.label)) {

2
Deploy/metafilemanager.cpp

@ -155,7 +155,7 @@ void MetaFileManager::createRunMetaFiles() {
for (auto i = DeployCore::_config->targets.cbegin(); i != DeployCore::_config->targets.cend(); ++i) {
if (i.value() && !createRunScript(i.key())) {
if (!createRunScript(*i)) {
qCritical() << "run script not created!";
}
}

541
UnitTests/modules.cpp

@ -1345,6 +1345,546 @@ QSet<QString> Modules::qmlLibs() {
QSet<QString> Modules::outTestLibs() {
TestUtils utils;
#ifdef Q_OS_WIN
auto Tree = utils.createTree({
"./" + DISTRO_DIR + "/TestQMLWidgets.bat",
"./" + DISTRO_DIR + "/lol/TestQMLWidgets.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/Qt5QuickControls2.dll",
"./" + DISTRO_DIR + "/lolLib/Qt5QuickTemplates2.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/bearer/qgenericbearer.dll",
"./" + 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/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 + "/q/QtGraphicalEffects/Blend.qml",
"./" + DISTRO_DIR + "/q/QtGraphicalEffects/BrightnessContrast.qml",
"./" + DISTRO_DIR + "/q/QtGraphicalEffects/ColorOverlay.qml",
"./" + DISTRO_DIR + "/q/QtGraphicalEffects/Colorize.qml",
"./" + DISTRO_DIR + "/q/QtGraphicalEffects/ConicalGradient.qml",
"./" + DISTRO_DIR + "/q/QtGraphicalEffects/Desaturate.qml",
"./" + DISTRO_DIR + "/q/QtGraphicalEffects/DirectionalBlur.qml",
"./" + DISTRO_DIR + "/q/QtGraphicalEffects/Displace.qml",
"./" + DISTRO_DIR + "/q/QtGraphicalEffects/DropShadow.qml",
"./" + DISTRO_DIR + "/q/QtGraphicalEffects/FastBlur.qml",
"./" + DISTRO_DIR + "/q/QtGraphicalEffects/GammaAdjust.qml",
"./" + DISTRO_DIR + "/q/QtGraphicalEffects/GaussianBlur.qml",
"./" + DISTRO_DIR + "/q/QtGraphicalEffects/Glow.qml",
"./" + DISTRO_DIR + "/q/QtGraphicalEffects/HueSaturation.qml",
"./" + DISTRO_DIR + "/q/QtGraphicalEffects/InnerShadow.qml",
"./" + DISTRO_DIR + "/q/QtGraphicalEffects/LevelAdjust.qml",
"./" + DISTRO_DIR + "/q/QtGraphicalEffects/LinearGradient.qml",
"./" + DISTRO_DIR + "/q/QtGraphicalEffects/MaskedBlur.qml",
"./" + DISTRO_DIR + "/q/QtGraphicalEffects/OpacityMask.qml",
"./" + DISTRO_DIR + "/q/QtGraphicalEffects/RadialBlur.qml",
"./" + DISTRO_DIR + "/q/QtGraphicalEffects/RadialGradient.qml",
"./" + DISTRO_DIR + "/q/QtGraphicalEffects/RectangularGlow.qml",
"./" + DISTRO_DIR + "/q/QtGraphicalEffects/RecursiveBlur.qml",
"./" + DISTRO_DIR + "/q/QtGraphicalEffects/ThresholdMask.qml",
"./" + DISTRO_DIR + "/q/QtGraphicalEffects/ZoomBlur.qml",
"./" + DISTRO_DIR + "/q/QtGraphicalEffects/plugins.qmltypes",
"./" + DISTRO_DIR + "/q/QtGraphicalEffects/private/DropShadowBase.qml",
"./" + DISTRO_DIR + "/q/QtGraphicalEffects/private/DropShadowBase.qmlc",
"./" + DISTRO_DIR + "/q/QtGraphicalEffects/private/FastGlow.qml",
"./" + DISTRO_DIR + "/q/QtGraphicalEffects/private/FastGlow.qmlc",
"./" + DISTRO_DIR + "/q/QtGraphicalEffects/private/FastInnerShadow.qml",
"./" + DISTRO_DIR + "/q/QtGraphicalEffects/private/FastInnerShadow.qmlc",
"./" + DISTRO_DIR + "/q/QtGraphicalEffects/private/FastMaskedBlur.qml",
"./" + DISTRO_DIR + "/q/QtGraphicalEffects/private/FastMaskedBlur.qmlc",
"./" + DISTRO_DIR + "/q/QtGraphicalEffects/private/GaussianDirectionalBlur.qml",
"./" + DISTRO_DIR + "/q/QtGraphicalEffects/private/GaussianDirectionalBlur.qmlc",
"./" + DISTRO_DIR + "/q/QtGraphicalEffects/private/GaussianGlow.qml",
"./" + DISTRO_DIR + "/q/QtGraphicalEffects/private/GaussianGlow.qmlc",
"./" + DISTRO_DIR + "/q/QtGraphicalEffects/private/GaussianInnerShadow.qml",
"./" + DISTRO_DIR + "/q/QtGraphicalEffects/private/GaussianInnerShadow.qmlc",
"./" + DISTRO_DIR + "/q/QtGraphicalEffects/private/GaussianMaskedBlur.qml",
"./" + DISTRO_DIR + "/q/QtGraphicalEffects/private/GaussianMaskedBlur.qmlc",
"./" + DISTRO_DIR + "/q/QtGraphicalEffects/private/qmldir",
"./" + DISTRO_DIR + "/q/QtGraphicalEffects/private/qtgraphicaleffectsprivate.dll",
"./" + DISTRO_DIR + "/q/QtGraphicalEffects/qmldir",
"./" + DISTRO_DIR + "/q/QtGraphicalEffects/qtgraphicaleffectsplugin.dll",
"./" + DISTRO_DIR + "/q/QtQuick.2/plugins.qmltypes",
"./" + DISTRO_DIR + "/q/QtQuick.2/qmldir",
"./" + DISTRO_DIR + "/q/QtQuick.2/qtquick2plugin.dll",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/AbstractButton.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Action.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/ActionGroup.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/ApplicationWindow.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/BusyIndicator.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Button.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/ButtonGroup.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/CheckBox.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/CheckDelegate.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/ComboBox.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Container.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Control.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/DelayButton.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Dial.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Dialog.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/DialogButtonBox.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Drawer.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Frame.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Fusion/ApplicationWindow.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Fusion/BusyIndicator.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Fusion/Button.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Fusion/ButtonPanel.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Fusion/CheckBox.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Fusion/CheckDelegate.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Fusion/CheckIndicator.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Fusion/ComboBox.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Fusion/DelayButton.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Fusion/Dial.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Fusion/Dialog.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Fusion/DialogButtonBox.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Fusion/Drawer.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Fusion/Frame.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Fusion/GroupBox.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Fusion/ItemDelegate.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Fusion/Label.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Fusion/Menu.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Fusion/MenuBar.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Fusion/MenuBarItem.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Fusion/MenuItem.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Fusion/MenuSeparator.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Fusion/Page.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Fusion/PageIndicator.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Fusion/Pane.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Fusion/Popup.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Fusion/ProgressBar.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Fusion/RadioButton.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Fusion/RadioDelegate.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Fusion/RadioIndicator.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Fusion/RangeSlider.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Fusion/RoundButton.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Fusion/ScrollBar.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Fusion/ScrollIndicator.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Fusion/Slider.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Fusion/SliderGroove.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Fusion/SliderHandle.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Fusion/SpinBox.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Fusion/SwipeDelegate.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Fusion/Switch.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Fusion/SwitchDelegate.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Fusion/SwitchIndicator.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Fusion/TabBar.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Fusion/TabButton.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Fusion/TextArea.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Fusion/TextField.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Fusion/ToolBar.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Fusion/ToolButton.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Fusion/ToolSeparator.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Fusion/ToolTip.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Fusion/Tumbler.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Fusion/plugins.qmltypes",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Fusion/qmldir",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Fusion/qtquickcontrols2fusionstyleplugin.dll",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/GroupBox.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Imagine/ApplicationWindow.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Imagine/BusyIndicator.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Imagine/Button.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Imagine/CheckBox.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Imagine/CheckDelegate.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Imagine/ComboBox.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Imagine/DelayButton.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Imagine/Dial.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Imagine/Dialog.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Imagine/DialogButtonBox.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Imagine/Drawer.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Imagine/Frame.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Imagine/GroupBox.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Imagine/ItemDelegate.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Imagine/Label.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Imagine/Menu.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Imagine/MenuItem.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Imagine/MenuSeparator.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Imagine/Page.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Imagine/PageIndicator.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Imagine/Pane.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Imagine/Popup.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Imagine/ProgressBar.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Imagine/RadioButton.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Imagine/RadioDelegate.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Imagine/RangeSlider.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Imagine/RoundButton.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Imagine/ScrollBar.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Imagine/ScrollIndicator.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Imagine/Slider.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Imagine/SpinBox.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Imagine/StackView.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Imagine/SwipeDelegate.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Imagine/SwipeView.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Imagine/Switch.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Imagine/SwitchDelegate.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Imagine/TabBar.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Imagine/TabButton.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Imagine/TextArea.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Imagine/TextField.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Imagine/ToolBar.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Imagine/ToolButton.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Imagine/ToolSeparator.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Imagine/ToolTip.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Imagine/Tumbler.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Imagine/plugins.qmltypes",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Imagine/qmldir",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Imagine/qtquickcontrols2imaginestyleplugin.dll",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/ItemDelegate.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Label.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Material/ApplicationWindow.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Material/BoxShadow.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Material/BusyIndicator.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Material/Button.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Material/CheckBox.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Material/CheckDelegate.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Material/CheckIndicator.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Material/ComboBox.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Material/CursorDelegate.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Material/DelayButton.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Material/Dial.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Material/Dialog.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Material/DialogButtonBox.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Material/Drawer.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Material/ElevationEffect.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Material/Frame.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Material/GroupBox.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Material/ItemDelegate.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Material/Label.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Material/Menu.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Material/MenuBar.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Material/MenuBarItem.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Material/MenuItem.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Material/MenuSeparator.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Material/Page.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Material/PageIndicator.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Material/Pane.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Material/Popup.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Material/ProgressBar.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Material/RadioButton.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Material/RadioDelegate.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Material/RadioIndicator.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Material/RangeSlider.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Material/RectangularGlow.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Material/RoundButton.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Material/ScrollBar.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Material/ScrollIndicator.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Material/Slider.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Material/SliderHandle.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Material/SpinBox.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Material/StackView.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Material/SwipeDelegate.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Material/SwipeView.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Material/Switch.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Material/SwitchDelegate.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Material/SwitchIndicator.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Material/TabBar.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Material/TabButton.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Material/TextArea.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Material/TextField.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Material/ToolBar.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Material/ToolButton.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Material/ToolSeparator.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Material/ToolTip.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Material/Tumbler.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Material/plugins.qmltypes",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Material/qmldir",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Material/qtquickcontrols2materialstyleplugin.dll",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Menu.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/MenuBar.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/MenuBarItem.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/MenuItem.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/MenuSeparator.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Page.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/PageIndicator.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Pane.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Popup.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/ProgressBar.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/RadioButton.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/RadioDelegate.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/RangeSlider.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/RoundButton.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/ScrollBar.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/ScrollIndicator.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/ScrollView.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Slider.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/SpinBox.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/StackView.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/SwipeDelegate.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/SwipeView.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Switch.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/SwitchDelegate.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/TabBar.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/TabButton.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/TextArea.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/TextField.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/ToolBar.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/ToolButton.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/ToolSeparator.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/ToolTip.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Tumbler.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Universal/ApplicationWindow.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Universal/BusyIndicator.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Universal/Button.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Universal/CheckBox.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Universal/CheckDelegate.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Universal/CheckIndicator.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Universal/ComboBox.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Universal/DelayButton.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Universal/Dial.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Universal/Dialog.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Universal/DialogButtonBox.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Universal/Drawer.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Universal/Frame.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Universal/GroupBox.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Universal/ItemDelegate.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Universal/Label.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Universal/Menu.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Universal/MenuBar.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Universal/MenuBarItem.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Universal/MenuItem.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Universal/MenuSeparator.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Universal/Page.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Universal/PageIndicator.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Universal/Pane.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Universal/Popup.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Universal/ProgressBar.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Universal/RadioButton.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Universal/RadioDelegate.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Universal/RadioIndicator.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Universal/RangeSlider.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Universal/RoundButton.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Universal/ScrollBar.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Universal/ScrollIndicator.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Universal/Slider.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Universal/SpinBox.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Universal/StackView.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Universal/SwipeDelegate.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Universal/Switch.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Universal/SwitchDelegate.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Universal/SwitchIndicator.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Universal/TabBar.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Universal/TabButton.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Universal/TextArea.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Universal/TextField.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Universal/ToolBar.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Universal/ToolButton.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Universal/ToolSeparator.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Universal/ToolTip.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Universal/Tumbler.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Universal/plugins.qmltypes",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Universal/qmldir",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Universal/qtquickcontrols2universalstyleplugin.dll",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/AbstractButtonSection.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/BusyIndicatorSpecifics.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/ButtonSection.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/ButtonSpecifics.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/CheckBoxSpecifics.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/CheckDelegateSpecifics.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/CheckSection.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/ComboBoxSpecifics.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/ContainerSection.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/ControlSection.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/ControlSpecifics.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/DelayButtonSpecifics.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/DialSpecifics.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/FrameSpecifics.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/GroupBoxSpecifics.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/ItemDelegateSection.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/ItemDelegateSpecifics.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/LabelSpecifics.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/PaddingSection.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/PageIndicatorSpecifics.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/PageSpecifics.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/PaneSection.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/PaneSpecifics.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/ProgressBarSpecifics.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/RadioButtonSpecifics.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/RadioDelegateSpecifics.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/RangeSliderSpecifics.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/RoundButtonSpecifics.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/ScrollViewSpecifics.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/SliderSpecifics.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/SpinBoxSpecifics.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/StackViewSpecifics.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/SwipeDelegateSpecifics.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/SwipeViewSpecifics.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/SwitchDelegateSpecifics.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/SwitchSpecifics.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/TabBarSpecifics.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/TabButtonSpecifics.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/TextAreaSpecifics.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/TextFieldSpecifics.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/ToolBarSpecifics.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/ToolButtonSpecifics.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/ToolSeparatorSpecifics.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/TumblerSpecifics.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/busyindicator-icon.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/busyindicator-icon16.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/busyindicator-icon@2x.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/button-icon.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/button-icon16.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/button-icon@2x.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/checkbox-icon.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/checkbox-icon16.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/checkbox-icon@2x.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/combobox-icon.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/combobox-icon16.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/combobox-icon@2x.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/delaybutton-icon.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/delaybutton-icon16.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/delaybutton-icon@2x.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/dial-icon.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/dial-icon16.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/dial-icon@2x.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/frame-icon.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/frame-icon16.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/frame-icon@2x.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/groupbox-icon.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/groupbox-icon16.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/groupbox-icon@2x.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/itemdelegate-icon.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/itemdelegate-icon16.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/itemdelegate-icon@2x.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/label-icon.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/label-icon16.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/label-icon@2x.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/page-icon.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/page-icon16.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/page-icon@2x.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/pageindicator-icon.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/pageindicator-icon16.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/pageindicator-icon@2x.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/pane-icon.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/pane-icon16.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/pane-icon@2x.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/progressbar-icon.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/progressbar-icon16.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/progressbar-icon@2x.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/radiobutton-icon.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/radiobutton-icon16.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/radiobutton-icon@2x.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/rangeslider-icon.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/rangeslider-icon16.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/rangeslider-icon@2x.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/roundbutton-icon.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/roundbutton-icon16.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/roundbutton-icon@2x.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/scrollview-icon.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/scrollview-icon16.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/scrollview-icon@2x.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/slider-icon.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/slider-icon16.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/slider-icon@2x.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/spinbox-icon.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/spinbox-icon16.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/spinbox-icon@2x.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/stackview-icon.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/stackview-icon16.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/stackview-icon@2x.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/swipeview-icon.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/swipeview-icon16.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/swipeview-icon@2x.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/switch-icon.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/switch-icon16.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/switch-icon@2x.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/textarea-icon.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/textarea-icon16.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/textarea-icon@2x.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/textfield-icon.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/textfield-icon16.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/textfield-icon@2x.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/toolbar-icon.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/toolbar-icon16.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/toolbar-icon@2x.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/toolbutton-icon.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/toolbutton-icon16.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/toolbutton-icon@2x.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/toolseparator-icon.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/toolseparator-icon16.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/toolseparator-icon@2x.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/tumbler-icon.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/tumbler-icon16.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/images/tumbler-icon@2x.png",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/designer/qtquickcontrols2.metainfo",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/plugins.qmltypes",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/qmldir",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/qtquickcontrols2plugin.dll",
"./" + DISTRO_DIR + "/q/QtQuick/Layouts/plugins.qmltypes",
"./" + DISTRO_DIR + "/q/QtQuick/Layouts/qmldir",
"./" + DISTRO_DIR + "/q/QtQuick/Layouts/qquicklayoutsplugin.dll",
"./" + DISTRO_DIR + "/q/QtQuick/Templates.2/plugins.qmltypes",
"./" + DISTRO_DIR + "/q/QtQuick/Templates.2/qmldir",
"./" + DISTRO_DIR + "/q/QtQuick/Templates.2/qtquicktemplates2plugin.dll",
"./" + DISTRO_DIR + "/q/QtQuick/Window.2/plugins.qmltypes",
"./" + DISTRO_DIR + "/q/QtQuick/Window.2/qmldir",
"./" + DISTRO_DIR + "/q/QtQuick/Window.2/windowplugin.dll"
});
#else
auto Tree = utils.createTree({
"./" + DISTRO_DIR + "/TestQMLWidgets.sh",
"./" + DISTRO_DIR + "/lol/TestQMLWidgets",
@ -1927,6 +2467,7 @@ QSet<QString> Modules::outTestLibs() {
"./" + DISTRO_DIR + "/q/QtQuick/Window.2/qmldir"
}
);
#endif
return Tree;
}

197
UnitTests/tst_deploytest.cpp

@ -856,18 +856,8 @@ void deploytest::testQt() {
runTestParams({"-bin", bin, "clear" ,
"-qmake", qmake}, &comapareTree);
#ifdef Q_OS_UNIX
comapareTree = Modules::qtWithoutTr();
bin = TestBinDir + "QtWidgetsProject";
#else
comapareTree = utils.createTree(
{"./" + DISTRO_DIR + "/TestQMLWidgets.exe",
"./" + DISTRO_DIR + "/qt.conf"});
bin = TestBinDir + "QtWidgetsProject.exe";
#endif
runTestParams({"-bin", bin, "clear" ,
"-qmake", qmake, "noTranslations"}, &comapareTree);
@ -881,28 +871,57 @@ void deploytest::testIgnore() {
#ifdef Q_OS_UNIX
QString bin = TestBinDir + "QtWidgetsProject";
QString qmake = TestQtDir + "bin/qmake";
#else
QString bin = TestBinDir + "QtWidgetsProject.exe";
QString qmake = TestQtDir + "bin/qmake.exe";
#endif
auto comapareTree = utils.createTree(
{
"./" + DISTRO_DIR + "/QtWidgetsProject.sh",
"./" + DISTRO_DIR + "/bin/qt.conf",
"./" + DISTRO_DIR + "/bin/QtWidgetsProject",
"./" + DISTRO_DIR + "/lib/libicudata.so",
"./" + DISTRO_DIR + "/lib/libicui18n.so",
"./" + DISTRO_DIR + "/lib/libicuuc.so"
});
#else
QString bin = TestBinDir + "QtWidgetsProject.exe";
QString qmake = TestQtDir + "bin/qmake.exe";
auto comapareTree = utils.createTree(
{
"./" + DISTRO_DIR + "/qt.conf",
"./" + DISTRO_DIR + "/QtWidgetsProject.exe",
});
#endif
if (!TestQtDir.contains("Qt5")) {
#ifdef Q_OS_UNIX
QString bin = TestBinDir + "QtWidgetsProject";
QString qmake = TestQtDir + "bin/qmake";
comapareTree += utils.createTree(
{
"./" + DISTRO_DIR + "/lib/libicudata.so",
"./" + DISTRO_DIR + "/lib/libicui18n.so",
"./" + DISTRO_DIR + "/lib/libicuuc.so"
});
#else
QString bin = TestBinDir + "QtWidgetsProject.exe";
QString qmake = TestQtDir + "bin/qmake.exe";
comapareTree += utils.createTree(
{ });
#endif
}
runTestParams({"-bin", bin, "clear" ,
"-qmake", qmake,
"-ignore", "Qt5"}, &comapareTree);
#ifdef Q_OS_UNIX
comapareTree = utils.createTree(
{
"./" + DISTRO_DIR + "/QtWidgetsProject.sh",
@ -910,13 +929,28 @@ void deploytest::testIgnore() {
"./" + DISTRO_DIR + "/bin/QtWidgetsProject",
});
auto removeTree = utils.createTree({
"./" + DISTRO_DIR + "/lib/libQt5VirtualKeyboard.so",
});
#else
comapareTree = utils.createTree(
{
"./" + DISTRO_DIR + "/qt.conf",
"./" + DISTRO_DIR + "/QtWidgetsProject.exe",
});
auto removeTree = utils.createTree({
"./" + DISTRO_DIR + "/Qt5VirtualKeyboard.dll",
});
#endif
runTestParams({"-bin", bin, "clear" ,
"-qmake", qmake,
"-ignoreEnv", TestQtDir + "/lib," + TestQtDir + "/bin" }, &comapareTree);
auto removeTree = utils.createTree({
"./" + DISTRO_DIR + "/lib/libQt5VirtualKeyboard.so",
});
comapareTree = Modules::qtLibs() - removeTree;
@ -933,12 +967,6 @@ void deploytest::testLibDir() {
QString bin = TestBinDir + "TestOnlyC";
QString extraPath = "/usr/lib";
#else
QString bin = TestBinDir + "TestOnlyC.exe";
QString extraPath = "/usr/lib";
#endif
auto comapareTree = utils.createTree(
{
"./" + DISTRO_DIR + "/TestOnlyC.sh",
@ -946,11 +974,28 @@ void deploytest::testLibDir() {
"./" + DISTRO_DIR + "/bin/TestOnlyC"
});
#else
QString bin = TestBinDir + "TestOnlyC.exe";
QString extraPath = TestQtDir;
auto comapareTree = utils.createTree(
{
"./" + DISTRO_DIR + "/qt.conf",
"./" + DISTRO_DIR + "/TestOnlyC.exe",
});
#endif
runTestParams({"-bin", bin, "clear" ,
"-libDir", extraPath,
}, &comapareTree);
#ifdef Q_OS_UNIX
comapareTree = utils.createTree(
{
"./" + DISTRO_DIR + "/TestOnlyC.sh",
@ -960,6 +1005,19 @@ void deploytest::testLibDir() {
"./" + DISTRO_DIR + "/lib/libgcc_s.so"
});
#else
comapareTree = utils.createTree(
{
"./" + DISTRO_DIR + "/qt.conf",
"./" + DISTRO_DIR + "/TestOnlyC.exe",
"./" + DISTRO_DIR + "/libgcc_s_seh-1.dll",
"./" + DISTRO_DIR + "/libwinpthread-1.dll",
"./" + DISTRO_DIR + "/libstdc++-6.dll",
});
#endif
runTestParams({"-bin", bin, "clear" ,
"-libDir", extraPath,
@ -976,22 +1034,6 @@ void deploytest::testExtraPlugins() {
QString extraPath = "/usr/lib";
QString qmake = TestQtDir + "bin/qmake";
#else
QString bin = TestBinDir + "QtWidgetsProject.exe";
QString extraPath = "/usr/lib";
QString qmake = TestQtDir + "bin/qmake.exe";
#endif
auto comapareTree = Modules::qtLibs();
runTestParams({"-bin", bin, "clear" ,
"-qmake", qmake,
}, &comapareTree);
auto pluginTree = utils.createTree(
{
"./" + DISTRO_DIR + "/bin/qt.conf",
@ -1001,6 +1043,29 @@ void deploytest::testExtraPlugins() {
"./" + DISTRO_DIR + "/lib/libQt5Sql.so",
});
#else
QString bin = TestBinDir + "QtWidgetsProject.exe";
QString extraPath = "/usr/lib";
QString qmake = TestQtDir + "bin/qmake.exe";
auto pluginTree = utils.createTree(
{
"./" + DISTRO_DIR + "/qt.conf",
"./" + DISTRO_DIR + "/plugins/sqldrivers/qsqlmysql.dll",
"./" + DISTRO_DIR + "/plugins/sqldrivers/qsqlodbc.dll",
"./" + DISTRO_DIR + "/plugins/sqldrivers/qsqlite.dll",
"./" + DISTRO_DIR + "/plugins/sqldrivers/qsqlpsql.dll",
"./" + DISTRO_DIR + "/Qt5Sql.dll",
});
#endif
auto comapareTree = Modules::qtLibs();
runTestParams({"-bin", bin, "clear" ,
"-qmake", qmake,
}, &comapareTree);
comapareTree = comapareTree + pluginTree;
@ -1015,17 +1080,17 @@ void deploytest::testTargetDir() {
#ifdef Q_OS_UNIX
QString bin = TestBinDir + "TestOnlyC";
#else
QString bin = TestBinDir + "TestOnlyC.exe";
#endif
auto comapareTree = utils.createTree(
{"./" + DISTRO_DIR + "Z/bin/TestOnlyC",
"./" + DISTRO_DIR + "Z/bin/qt.conf",
"./" + DISTRO_DIR + "Z/TestOnlyC.sh"});
#else
QString bin = TestBinDir + "TestOnlyC.exe";
auto comapareTree = utils.createTree(
{"./" + DISTRO_DIR + "Z/TestOnlyC.exe",
"./" + DISTRO_DIR + "Z/qt.conf"});
#endif
runTestParams({"-bin", bin, "clear" ,
"-targetDir", "./" + DISTRO_DIR + "Z"
@ -1050,11 +1115,11 @@ void deploytest::testSystemLib() {
QString bin = TestBinDir + "TestOnlyC.exe";
auto comapareTree = utils.createTree(
{
"./" + DISTRO_DIR + "/TestOnlyC.sh",
"./" + DISTRO_DIR + "/bin/qt.conf",
"./" + DISTRO_DIR + "/bin/TestOnlyC",
"./" + DISTRO_DIR + "/lib/libgcc_s.so",
"./" + DISTRO_DIR + "/lib/libstdc++.so"
"./" + DISTRO_DIR + "/TestOnlyC.exe",
"./" + DISTRO_DIR + "/libgcc_s_seh-1.dll",
"./" + DISTRO_DIR + "/libstdc++-6.dll",
"./" + DISTRO_DIR + "/libwinpthread-1.dll",
"./" + DISTRO_DIR + "/qt.conf"
});
#endif
@ -1149,7 +1214,7 @@ void deploytest::testOutDirs() {
runTestParams({"-bin", bin, "clear" ,
"-binOut", "/",
"-binOut", "/lol",
"-libOut", "/lolLib",
"-trOut", "/lolTr",
"-pluginOut", "/p",
@ -1158,18 +1223,6 @@ void deploytest::testOutDirs() {
"-qmlDir", TestBinDir + "/../TestQMLWidgets"
}, &comapareTree);
comapareTree -= utils.createTree(
{
"./" + DISTRO_DIR + "/bin/qt.conf",
"./" + DISTRO_DIR + "/bin/TestQMLWidgets.exe",
});
comapareTree -= utils.createTree(
{
"./" + DISTRO_DIR + "/qt.conf",
"./" + DISTRO_DIR + "/TestQMLWidgets.exe",
"./" + DISTRO_DIR + "/TestQMLWidgets.bat",
});
file.setFileName( "./" + DISTRO_DIR + "/TestQMLWidgets.bat");
@ -1179,7 +1232,9 @@ void deploytest::testOutDirs() {
runScript = file.readAll();
file.close();
QVERIFY(runScript.contains("TestQMLWidgets.exe"));
QVERIFY(runScript.contains("SET BASE_DIR=%~dp0"));
QVERIFY(runScript.contains("SET PATH=%BASE_DIR%\\\\lolLib\\;%PATH%"));
QVERIFY(runScript.contains("start \"\" \"%BASE_DIR%\\\\lol\\TestQMLWidgets.exe\" %*"));
#endif