QuasarApp/CQtDeployer
4
1
Fork 0
mirror of https://github.com/QuasarApp/CQtDeployer.git synced 2025-04-26 17:54:32 +00:00
Code Issues Projects Releases Wiki Activity

fixed deploy qt modules

Browse Source
This commit is contained in:
Andrei Yankovich 2020-11-28 20:02:51 +03:00
parent 153f0d3bce
commit 008c608f75
5 changed files with 115 additions and 253 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
Deploy/deploycore.cpp
View File

@ -26,60 +26,60 @@
const DeployConfig* DeployCore::_config = nullptr;
QtModuleEntry DeployCore::qtModuleEntries[] = {
{ QtBluetoothModule, "bluetooth", "Bluetooth", nullptr },
{ QtConcurrentModule, "concurrent", "Concurrent", "qtbase" },
{ QtCoreModule, "core", "Core", "qtbase" },
{ QtDeclarativeModule, "declarative", "Declarative", "qtquick1" },
{ QtDesignerModule, "designer", "Designer", nullptr },
{ QtDesignerComponents, "designercomponents", "DesignerComponents", nullptr },
{ QtBluetoothModule, "bluetooth", "QtXBluetooth", nullptr },
{ QtConcurrentModule, "concurrent", "QtXConcurrent", "qtbase" },
{ QtCoreModule, "core", "QtXCore", "qtbase" },
{ QtDeclarativeModule, "declarative", "QtXDeclarative", "qtquick1" },
{ QtDesignerModule, "designer", "QtXDesigner", nullptr },
{ QtDesignerComponents, "designercomponents", "QtXDesignerComponents", nullptr },
{ QtEnginioModule, "enginio", "Enginio", nullptr },
{ QtGamePadModule, "gamepad", "Gamepad", nullptr },
{ QtGuiModule, "gui", "Gui", "qtbase" },
{ QtHelpModule, "qthelp", "Help", "qt_help" },
{ QtMultimediaModule, "multimedia", "Multimedia", "qtmultimedia" },
{ QtMultimediaWidgetsModule, "multimediawidgets", "MultimediaWidgets", "qtmultimedia" },
{ QtMultimediaQuickModule, "multimediaquick", "MultimediaQuick_p", "qtmultimedia" },
{ QtNetworkModule, "network", "Network", "qtbase" },
{ QtNfcModule, "nfc", "Nfc", nullptr },
{ QtOpenGLModule, "opengl", "OpenGL", nullptr },
{ QtOpenGLWidgetsModule, "openglwidgets", "OpenGLWidgets", nullptr },
{ QtPositioningModule, "positioning", "Positioning", nullptr },
{ QtPrintSupportModule, "printsupport", "PrintSupport", nullptr },
{ QtQmlModule, "qml", "Qml", "qtdeclarative" },
{ QtGamePadModule, "gamepad", "QtXGamepad", nullptr },
{ QtGuiModule, "gui", "QtXGui", "qtbase" },
{ QtHelpModule, "qthelp", "QtXHelp", "qt_help" },
{ QtMultimediaModule, "multimedia", "QtXMultimedia", "qtmultimedia" },
{ QtMultimediaWidgetsModule, "multimediawidgets", "QtXMultimediaWidgets", "qtmultimedia" },
{ QtMultimediaQuickModule, "multimediaquick", "QtXMultimediaQuick_p", "qtmultimedia" },
{ QtNetworkModule, "network", "QtXNetwork", "qtbase" },
{ QtNfcModule, "nfc", "QtXNfc", nullptr },
{ QtOpenGLModule, "opengl", "QtXOpenGL", nullptr },
{ QtOpenGLWidgetsModule, "openglwidgets", "QtXOpenGLWidgets", nullptr },
{ QtPositioningModule, "positioning", "QtXPositioning", nullptr },
{ QtPrintSupportModule, "printsupport", "QtXPrintSupport", nullptr },
{ QtQmlModule, "qml", "QtXQml", "qtdeclarative" },
{ QtQmlToolingModule, "qmltooling", "qmltooling", nullptr },
{ QtQuickModule, "quick", "Quick", "qtdeclarative" },
{ QtQuickParticlesModule, "quickparticles", "QuickParticles", nullptr },
{ QtQuickWidgetsModule, "quickwidgets", "QuickWidgets", nullptr },
{ QtScriptModule, "script", "Script", "qtscript" },
{ QtScriptToolsModule, "scripttools", "ScriptTools", "qtscript" },
{ QtSensorsModule, "sensors", "Sensors", nullptr },
{ QtSerialPortModule, "serialport", "SerialPort", "qtserialport" },
{ QtSqlModule, "sql", "Sql", "qtbase" },
{ QtSvgWidgetsModule, "svgwidgets", "SvgWidgets", nullptr },
{ QtSvgModule, "svg", "Svg", nullptr },
{ QtTestModule, "test", "Test", "qtbase" },
{ QtWebKitModule, "webkit", "WebKit", nullptr },
{ QtWebKitWidgetsModule, "webkitwidgets", "WebKitWidgets", nullptr },
{ QtWebSocketsModule, "websockets", "WebSockets", nullptr },
{ QtWidgetsModule, "widgets", "Widgets", "qtbase" },
{ QtWinExtrasModule, "winextras", "WinExtras", nullptr },
{ QtXmlModule, "xml", "Xml", "qtbase" },
{ QtXmlPatternsModule, "xmlpatterns", "XmlPatterns", "qtxmlpatterns" },
{ QtWebEngineCoreModule, "webenginecore", "WebEngineCore", nullptr },
{ QtWebEngineModule, "webengine", "WebEngine", "qtwebengine" },
{ QtWebEngineWidgetsModule, "webenginewidgets", "WebEngineWidgets", nullptr },
{ Qt3DCoreModule, "3dcore", "3DCore", nullptr },
{ Qt3DRendererModule, "3drenderer", "3DRender", nullptr },
{ Qt3DQuickModule, "3dquick", "3DQuick", nullptr },
{ Qt3DQuickRendererModule, "3dquickrenderer", "3DQuickRender", nullptr },
{ Qt3DInputModule, "3dinput", "3DInput", nullptr },
{ Qt3DAnimationModule, "3danimation", "3DAnimation", nullptr },
{ Qt3DExtrasModule, "3dextras", "3DExtras", nullptr },
{ QtLocationModule, "geoservices", "Location", nullptr },
{ QtWebChannelModule, "webchannel", "WebChannel", nullptr },
{ QtTextToSpeechModule, "texttospeech", "TextToSpeech", nullptr },
{ QtSerialBusModule, "serialbus", "SerialBus", nullptr },
{ QtWebViewModule, "webview", "WebView", nullptr }
{ QtQuickModule, "quick", "QtXQuick", "qtdeclarative" },
{ QtQuickParticlesModule, "quickparticles", "QtXQuickParticles", nullptr },
{ QtQuickWidgetsModule, "quickwidgets", "QtXQuickWidgets", nullptr },
{ QtScriptModule, "script", "QtXScript", "qtscript" },
{ QtScriptToolsModule, "scripttools", "QtXScriptTools", "qtscript" },
{ QtSensorsModule, "sensors", "QtXSensors", nullptr },
{ QtSerialPortModule, "serialport", "QtXSerialPort", "qtserialport" },
{ QtSqlModule, "sql", "QtXSql", "qtbase" },
{ QtSvgWidgetsModule, "svgwidgets", "QtXSvgWidgets", nullptr },
{ QtSvgModule, "svg", "QtXSvg", nullptr },
{ QtTestModule, "test", "QtXTest", "qtbase" },
{ QtWebKitModule, "webkit", "QtXWebKit", nullptr },
{ QtWebKitWidgetsModule, "webkitwidgets", "QtXWebKitWidgets", nullptr },
{ QtWebSocketsModule, "websockets", "QtXWebSockets", nullptr },
{ QtWidgetsModule, "widgets", "QtXWidgets", "qtbase" },
{ QtWinExtrasModule, "winextras", "QtXWinExtras", nullptr },
{ QtXmlModule, "xml", "QtXXml", "qtbase" },
{ QtXmlPatternsModule, "xmlpatterns", "QtXXmlPatterns", "qtxmlpatterns" },
{ QtWebEngineCoreModule, "webenginecore", "QtXWebEngineCore", nullptr },
{ QtWebEngineModule, "webengine", "QtXWebEngine", "qtwebengine" },
{ QtWebEngineWidgetsModule, "webenginewidgets", "QtXWebEngineWidgets", nullptr },
{ Qt3DCoreModule, "3dcore", "QtX3DCore", nullptr },
{ Qt3DRendererModule, "3drenderer", "QtX3DRender", nullptr },
{ Qt3DQuickModule, "3dquick", "QtX3DQuick", nullptr },
{ Qt3DQuickRendererModule, "3dquickrenderer", "QtX3DQuickRender", nullptr },
{ Qt3DInputModule, "3dinput", "QtX3DInput", nullptr },
{ Qt3DAnimationModule, "3danimation", "QtX3DAnimation", nullptr },
{ Qt3DExtrasModule, "3dextras", "QtX3DExtras", nullptr },
{ QtLocationModule, "geoservices", "QtXLocation", nullptr },
{ QtWebChannelModule, "webchannel", "QtXWebChannel", nullptr },
{ QtTextToSpeechModule, "texttospeech", "QtXTextToSpeech", nullptr },
{ QtSerialBusModule, "serialbus", "QtXSerialBus", nullptr },
{ QtWebViewModule, "webview", "QtXWebView", nullptr }
};
DeployCore::QtModule DeployCore::getQtModule(const QString& path) {
@ -94,7 +94,7 @@ DeployCore::QtModule DeployCore::getQtModule(const QString& path) {
auto lIbName = QFileInfo(path).fileName();
for (int i = 0; i < modulesCount; ++i) {
if (lIbName.contains(qtModuleEntries[i].libraryName)) {
if (containsModule(qtModuleEntries[i].libraryName, lIbName)) {
return static_cast<DeployCore::QtModule>(qtModuleEntries[i].module);
}
}
@ -144,6 +144,11 @@ LibPriority DeployCore::getLibPriority(const QString &lib) {
return SystemLib;
}
bool DeployCore::containsModule(const QString& moduleLibrary, const QString& lib) {
QRegExp erfexp(QString(moduleLibrary).replace("QtX", "Qt[4,5,6]"));
return lib.contains(erfexp);
}
#define C(X) QuasarAppUtils::Params::isEndable(X)
RunMode DeployCore::getMode() {
if (C("help") || C("h") || C("v") || C("version")) {
@ -342,8 +347,7 @@ QStringList DeployCore::extractTranslation(const QSet<QString> &libs) {
for (const auto &lib: libs) {
for (size_t i = 0; i < qtModulesCount; ++i) {
if (lib.contains(qtModuleEntries[i].libraryName) &&
qtModuleEntries[i].translation) {
if (containsModule(qtModuleEntries[i].libraryName, lib) && qtModuleEntries[i].translation) {
res.insert(qtModuleEntries[i].translation);
}
}

8
Deploy/deploycore.h
View File

@ -213,6 +213,14 @@ public:
static char getEnvSeparator();
static LibPriority getLibPriority(const QString &lib);
/**
* @brief containsModule This method compare lib name and module of qt.
* @param muduleIndex this is name of module library
* @param lib This is library name
* @return true if library has some module that as muduleIndex
*/
static bool containsModule(const QString &moduleLibrary, const QString &lib);
static DeployCore::QtModule getQtModule(const QString& path);
static void addQtModule(DeployCore::QtModule& module, const QString& path);

5
Deploy/extracter.cpp
View File

@ -40,8 +40,8 @@ bool Extracter::deployMSVC() {
bool Extracter::isWebEngine(const QString &package) const {
auto qtModules = _packageDependencyes.value(package).qtModules();
auto webEngine = DeployCore::QtModule::QtWebEngineModule;
auto webEngine = DeployCore::QtModule::QtWebEngineCoreModule ;
return static_cast<quint64>(qtModules) & static_cast<quint64>(webEngine);
}
@ -50,8 +50,8 @@ bool Extracter::extractWebEngine() {
auto cnf = DeployCore::_config;
for (auto i = cnf->packages().cbegin(); i != cnf->packages().cend(); ++i) {
const auto &package = i.key();
if (isWebEngine(package)) {
auto webEngeneBin = cnf->qtDir.getLibexecs();
@ -66,7 +66,6 @@ bool Extracter::extractWebEngine() {
auto libOut = cnf->getTargetDir() + "/" + package + cnf->packages()[package].getLibOutDir();
auto res = cnf->qtDir.getResources();
if (!_fileManager->copyFiles(angleGLLibs(), libOut)) {
return false;
}

217
UnitTests/modulesqt513.cpp
View File

@ -747,27 +747,6 @@ QSet<QString> ModulesQt513::qmlLibs(const QString &distDir) const {
"./" + distDir + "/translations/qtdeclarative_ru.qm",
"./" + distDir + "/translations/qtdeclarative_sk.qm",
"./" + distDir + "/translations/qtdeclarative_uk.qm",
"./" + distDir + "/translations/qtscript_ar.qm",
"./" + distDir + "/translations/qtscript_bg.qm",
"./" + distDir + "/translations/qtscript_ca.qm",
"./" + distDir + "/translations/qtscript_cs.qm",
"./" + distDir + "/translations/qtscript_da.qm",
"./" + distDir + "/translations/qtscript_de.qm",
"./" + distDir + "/translations/qtscript_en.qm",
"./" + distDir + "/translations/qtscript_es.qm",
"./" + distDir + "/translations/qtscript_fi.qm",
"./" + distDir + "/translations/qtscript_fr.qm",
"./" + distDir + "/translations/qtscript_he.qm",
"./" + distDir + "/translations/qtscript_hu.qm",
"./" + distDir + "/translations/qtscript_it.qm",
"./" + distDir + "/translations/qtscript_ja.qm",
"./" + distDir + "/translations/qtscript_ko.qm",
"./" + distDir + "/translations/qtscript_lv.qm",
"./" + distDir + "/translations/qtscript_pl.qm",
"./" + distDir + "/translations/qtscript_ru.qm",
"./" + distDir + "/translations/qtscript_sk.qm",
"./" + distDir + "/translations/qtscript_tr.qm",
"./" + distDir + "/translations/qtscript_uk.qm"
});
#else
@ -1278,27 +1257,6 @@ QSet<QString> ModulesQt513::qmlLibs(const QString &distDir) const {
"./" + distDir + "/translations/qtdeclarative_ru.qm",
"./" + distDir + "/translations/qtdeclarative_sk.qm",
"./" + distDir + "/translations/qtdeclarative_uk.qm",
"./" + distDir + "/translations/qtscript_ar.qm",
"./" + distDir + "/translations/qtscript_bg.qm",
"./" + distDir + "/translations/qtscript_ca.qm",
"./" + distDir + "/translations/qtscript_cs.qm",
"./" + distDir + "/translations/qtscript_da.qm",
"./" + distDir + "/translations/qtscript_de.qm",
"./" + distDir + "/translations/qtscript_en.qm",
"./" + distDir + "/translations/qtscript_es.qm",
"./" + distDir + "/translations/qtscript_fi.qm",
"./" + distDir + "/translations/qtscript_fr.qm",
"./" + distDir + "/translations/qtscript_he.qm",
"./" + distDir + "/translations/qtscript_hu.qm",
"./" + distDir + "/translations/qtscript_it.qm",
"./" + distDir + "/translations/qtscript_ja.qm",
"./" + distDir + "/translations/qtscript_ko.qm",
"./" + distDir + "/translations/qtscript_lv.qm",
"./" + distDir + "/translations/qtscript_pl.qm",
"./" + distDir + "/translations/qtscript_ru.qm",
"./" + distDir + "/translations/qtscript_sk.qm",
"./" + distDir + "/translations/qtscript_tr.qm",
"./" + distDir + "/translations/qtscript_uk.qm"
});
#endif
@ -1896,27 +1854,6 @@ QSet<QString> ModulesQt513::testDistroLibs(const QString &distDir) const {
"./" + distDir + "/package2/ZzZ/translations/qtdeclarative_ru.qm",
"./" + distDir + "/package2/ZzZ/translations/qtdeclarative_sk.qm",
"./" + distDir + "/package2/ZzZ/translations/qtdeclarative_uk.qm",
"./" + distDir + "/package2/ZzZ/translations/qtscript_ar.qm",
"./" + distDir + "/package2/ZzZ/translations/qtscript_bg.qm",
"./" + distDir + "/package2/ZzZ/translations/qtscript_ca.qm",
"./" + distDir + "/package2/ZzZ/translations/qtscript_cs.qm",
"./" + distDir + "/package2/ZzZ/translations/qtscript_da.qm",
"./" + distDir + "/package2/ZzZ/translations/qtscript_de.qm",
"./" + distDir + "/package2/ZzZ/translations/qtscript_en.qm",
"./" + distDir + "/package2/ZzZ/translations/qtscript_es.qm",
"./" + distDir + "/package2/ZzZ/translations/qtscript_fi.qm",
"./" + distDir + "/package2/ZzZ/translations/qtscript_fr.qm",
"./" + distDir + "/package2/ZzZ/translations/qtscript_he.qm",
"./" + distDir + "/package2/ZzZ/translations/qtscript_hu.qm",
"./" + distDir + "/package2/ZzZ/translations/qtscript_it.qm",
"./" + distDir + "/package2/ZzZ/translations/qtscript_ja.qm",
"./" + distDir + "/package2/ZzZ/translations/qtscript_ko.qm",
"./" + distDir + "/package2/ZzZ/translations/qtscript_lv.qm",
"./" + distDir + "/package2/ZzZ/translations/qtscript_pl.qm",
"./" + distDir + "/package2/ZzZ/translations/qtscript_ru.qm",
"./" + distDir + "/package2/ZzZ/translations/qtscript_sk.qm",
"./" + distDir + "/package2/ZzZ/translations/qtscript_tr.qm",
"./" + distDir + "/package2/ZzZ/translations/qtscript_uk.qm"
}
);
#else
@ -2571,27 +2508,6 @@ QSet<QString> ModulesQt513::testDistroLibs(const QString &distDir) const {
"./" + distDir + "/package2/ZzZ/translations/qtdeclarative_ru.qm",
"./" + distDir + "/package2/ZzZ/translations/qtdeclarative_sk.qm",
"./" + distDir + "/package2/ZzZ/translations/qtdeclarative_uk.qm",
"./" + distDir + "/package2/ZzZ/translations/qtscript_ar.qm",
"./" + distDir + "/package2/ZzZ/translations/qtscript_bg.qm",
"./" + distDir + "/package2/ZzZ/translations/qtscript_ca.qm",
"./" + distDir + "/package2/ZzZ/translations/qtscript_cs.qm",
"./" + distDir + "/package2/ZzZ/translations/qtscript_da.qm",
"./" + distDir + "/package2/ZzZ/translations/qtscript_de.qm",
"./" + distDir + "/package2/ZzZ/translations/qtscript_en.qm",
"./" + distDir + "/package2/ZzZ/translations/qtscript_es.qm",
"./" + distDir + "/package2/ZzZ/translations/qtscript_fi.qm",
"./" + distDir + "/package2/ZzZ/translations/qtscript_fr.qm",
"./" + distDir + "/package2/ZzZ/translations/qtscript_he.qm",
"./" + distDir + "/package2/ZzZ/translations/qtscript_hu.qm",
"./" + distDir + "/package2/ZzZ/translations/qtscript_it.qm",
"./" + distDir + "/package2/ZzZ/translations/qtscript_ja.qm",
"./" + distDir + "/package2/ZzZ/translations/qtscript_ko.qm",
"./" + distDir + "/package2/ZzZ/translations/qtscript_lv.qm",
"./" + distDir + "/package2/ZzZ/translations/qtscript_pl.qm",
"./" + distDir + "/package2/ZzZ/translations/qtscript_ru.qm",
"./" + distDir + "/package2/ZzZ/translations/qtscript_sk.qm",
"./" + distDir + "/package2/ZzZ/translations/qtscript_tr.qm",
"./" + distDir + "/package2/ZzZ/translations/qtscript_uk.qm"
}
@ -2662,27 +2578,6 @@ QSet<QString> ModulesQt513::testOutLibs(const QString &distDir) const {
"./" + distDir + "/lolTr/qtdeclarative_ru.qm",
"./" + distDir + "/lolTr/qtdeclarative_sk.qm",
"./" + distDir + "/lolTr/qtdeclarative_uk.qm",
"./" + distDir + "/lolTr/qtscript_ar.qm",
"./" + distDir + "/lolTr/qtscript_bg.qm",
"./" + distDir + "/lolTr/qtscript_ca.qm",
"./" + distDir + "/lolTr/qtscript_cs.qm",
"./" + distDir + "/lolTr/qtscript_da.qm",
"./" + distDir + "/lolTr/qtscript_de.qm",
"./" + distDir + "/lolTr/qtscript_en.qm",
"./" + distDir + "/lolTr/qtscript_es.qm",
"./" + distDir + "/lolTr/qtscript_fi.qm",
"./" + distDir + "/lolTr/qtscript_fr.qm",
"./" + distDir + "/lolTr/qtscript_he.qm",
"./" + distDir + "/lolTr/qtscript_hu.qm",
"./" + distDir + "/lolTr/qtscript_it.qm",
"./" + distDir + "/lolTr/qtscript_ja.qm",
"./" + distDir + "/lolTr/qtscript_ko.qm",
"./" + distDir + "/lolTr/qtscript_lv.qm",
"./" + distDir + "/lolTr/qtscript_pl.qm",
"./" + distDir + "/lolTr/qtscript_ru.qm",
"./" + distDir + "/lolTr/qtscript_sk.qm",
"./" + distDir + "/lolTr/qtscript_tr.qm",
"./" + distDir + "/lolTr/qtscript_uk.qm",
"./" + distDir + "/p/bearer/qgenericbearer.dll",
"./" + distDir + "/p/iconengines/qsvgicon.dll",
"./" + distDir + "/p/imageformats/qgif.dll",
@ -3227,27 +3122,6 @@ QSet<QString> ModulesQt513::testOutLibs(const QString &distDir) const {
"./" + distDir + "/lolTr/qtdeclarative_ru.qm",
"./" + distDir + "/lolTr/qtdeclarative_sk.qm",
"./" + distDir + "/lolTr/qtdeclarative_uk.qm",
"./" + distDir + "/lolTr/qtscript_ar.qm",
"./" + distDir + "/lolTr/qtscript_bg.qm",
"./" + distDir + "/lolTr/qtscript_ca.qm",
"./" + distDir + "/lolTr/qtscript_cs.qm",
"./" + distDir + "/lolTr/qtscript_da.qm",
"./" + distDir + "/lolTr/qtscript_de.qm",
"./" + distDir + "/lolTr/qtscript_en.qm",
"./" + distDir + "/lolTr/qtscript_es.qm",
"./" + distDir + "/lolTr/qtscript_fi.qm",
"./" + distDir + "/lolTr/qtscript_fr.qm",
"./" + distDir + "/lolTr/qtscript_he.qm",
"./" + distDir + "/lolTr/qtscript_hu.qm",
"./" + distDir + "/lolTr/qtscript_it.qm",
"./" + distDir + "/lolTr/qtscript_ja.qm",
"./" + distDir + "/lolTr/qtscript_ko.qm",
"./" + distDir + "/lolTr/qtscript_lv.qm",
"./" + distDir + "/lolTr/qtscript_pl.qm",
"./" + distDir + "/lolTr/qtscript_ru.qm",
"./" + distDir + "/lolTr/qtscript_sk.qm",
"./" + distDir + "/lolTr/qtscript_tr.qm",
"./" + distDir + "/lolTr/qtscript_uk.qm",
"./" + distDir + "/p/bearer/libqconnmanbearer.so",
"./" + distDir + "/p/bearer/libqgenericbearer.so",
"./" + distDir + "/p/bearer/libqnmbearer.so",
@ -4326,27 +4200,6 @@ QSet<QString> ModulesQt513::qtWebEngine(const QString &distDir) const {
"./" + distDir + "/translations/qtwebengine_pl.qm",
"./" + distDir + "/translations/qtwebengine_ru.qm",
"./" + distDir + "/translations/qtwebengine_uk.qm",
"./" + distDir + "/translations/qtscript_ar.qm",
"./" + distDir + "/translations/qtscript_bg.qm",
"./" + distDir + "/translations/qtscript_ca.qm",
"./" + distDir + "/translations/qtscript_cs.qm",
"./" + distDir + "/translations/qtscript_da.qm",
"./" + distDir + "/translations/qtscript_de.qm",
"./" + distDir + "/translations/qtscript_en.qm",
"./" + distDir + "/translations/qtscript_es.qm",
"./" + distDir + "/translations/qtscript_fi.qm",
"./" + distDir + "/translations/qtscript_fr.qm",
"./" + distDir + "/translations/qtscript_he.qm",
"./" + distDir + "/translations/qtscript_hu.qm",
"./" + distDir + "/translations/qtscript_it.qm",
"./" + distDir + "/translations/qtscript_ja.qm",
"./" + distDir + "/translations/qtscript_ko.qm",
"./" + distDir + "/translations/qtscript_lv.qm",
"./" + distDir + "/translations/qtscript_pl.qm",
"./" + distDir + "/translations/qtscript_ru.qm",
"./" + distDir + "/translations/qtscript_sk.qm",
"./" + distDir + "/translations/qtscript_tr.qm",
"./" + distDir + "/translations/qtscript_uk.qm",
}
);
#else
@ -4365,19 +4218,46 @@ QSet<QString> ModulesQt513::qtWebEngineWidgets(const QString &distDir) const {
Tree = Tree + utils.createTree(
{
"./" + distDir + "/bin/QtWebEngineProcess",
"./" + distDir + "/bin/quicknanobrowser",
"./" + distDir + "/bin/webui",
"./" + distDir + "/webui.sh",
"./" + distDir + "/lib/libQt5Positioning.so",
"./" + distDir + "/lib/libQt5RemoteObjects.so",
"./" + distDir + "/lib/libQt5SerialPort.so",
"./" + distDir + "/lib/libQt5WebChannel.so",
"./" + distDir + "/lib/libQt5WebEngine.so",
"./" + distDir + "/lib/libQt5WebEngineCore.so",
"./" + distDir + "/lib/libQt5Network.so",
"./" + distDir + "/lib/libQt5PrintSupport.so",
"./" + distDir + "/lib/libQt5Qml.so",
"./" + distDir + "/lib/libQt5QmlModels.so",
"./" + distDir + "/lib/libQt5Quick.so",
"./" + distDir + "/lib/libQt5QuickWidgets.so",
"./" + distDir + "/lib/libQt5WebEngineWidgets.so",
"./" + distDir + "/lib/libQt5WaylandCompositor.so",
"./" + distDir + "/plugins/bearer/libqconnmanbearer.so",
"./" + distDir + "/plugins/bearer/libqgenericbearer.so",
"./" + distDir + "/plugins/bearer/libqnmbearer.so",
"./" + distDir + "/plugins/printsupport/libcupsprintersupport.so",
"./" + distDir + "/plugins/position/libqtposition_geoclue.so",
"./" + distDir + "/plugins/position/libqtposition_geoclue2.so",
"./" + distDir + "/plugins/position/libqtposition_positionpoll.so",
"./" + distDir + "/plugins/position/libqtposition_serialnmea.so",
"./" + distDir + "/plugins/wayland-graphics-integration-client/libvulkan-server.so",
"./" + distDir + "/plugins/wayland-graphics-integration-server/libvulkan-server.so",
"./" + distDir + "/plugins/wayland-graphics-integration-client/libdmabuf-server.so",
"./" + distDir + "/plugins/wayland-graphics-integration-client/libdrm-egl-server.so",
"./" + distDir + "/plugins/wayland-graphics-integration-client/libqt-plugin-wayland-egl.so",
"./" + distDir + "/plugins/wayland-graphics-integration-client/libshm-emulation-server.so",
"./" + distDir + "/plugins/wayland-graphics-integration-client/libxcomposite-egl.so",
"./" + distDir + "/plugins/wayland-graphics-integration-client/libxcomposite-glx.so",
"./" + distDir + "/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-dmabuf-server-buffer.so",
"./" + distDir + "/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-drm-egl-server-buffer.so",
"./" + distDir + "/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-linux-dmabuf-unstable-v1.so",
"./" + distDir + "/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-shm-emulation-server.so",
"./" + distDir + "/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-vulkan-server.so",
"./" + distDir + "/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-wayland-egl.so",
"./" + distDir + "/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-wayland-eglstream-controller.so",
"./" + distDir + "/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-xcomposite-egl.so",
"./" + distDir + "/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-xcomposite-glx.so",
"./" + distDir + "/plugins/wayland-decoration-client/libbradient.so",
"./" + distDir + "/resources/icudtl.dat",
"./" + distDir + "/resources/qtwebengine_devtools_resources.pak",
"./" + distDir + "/resources/qtwebengine_resources.pak",
@ -4451,27 +4331,22 @@ QSet<QString> ModulesQt513::qtWebEngineWidgets(const QString &distDir) const {
"./" + distDir + "/translations/qtwebengine_pl.qm",
"./" + distDir + "/translations/qtwebengine_ru.qm",
"./" + distDir + "/translations/qtwebengine_uk.qm",
"./" + distDir + "/translations/qtscript_ar.qm",
"./" + distDir + "/translations/qtscript_bg.qm",
"./" + distDir + "/translations/qtscript_ca.qm",
"./" + distDir + "/translations/qtscript_cs.qm",
"./" + distDir + "/translations/qtscript_da.qm",
"./" + distDir + "/translations/qtscript_de.qm",
"./" + distDir + "/translations/qtscript_en.qm",
"./" + distDir + "/translations/qtscript_es.qm",
"./" + distDir + "/translations/qtscript_fi.qm",
"./" + distDir + "/translations/qtscript_fr.qm",
"./" + distDir + "/translations/qtscript_he.qm",
"./" + distDir + "/translations/qtscript_hu.qm",
"./" + distDir + "/translations/qtscript_it.qm",
"./" + distDir + "/translations/qtscript_ja.qm",
"./" + distDir + "/translations/qtscript_ko.qm",
"./" + distDir + "/translations/qtscript_lv.qm",
"./" + distDir + "/translations/qtscript_pl.qm",
"./" + distDir + "/translations/qtscript_ru.qm",
"./" + distDir + "/translations/qtscript_sk.qm",
"./" + distDir + "/translations/qtscript_tr.qm",
"./" + distDir + "/translations/qtscript_uk.qm",
"./" + distDir + "/translations/qtdeclarative_bg.qm",
"./" + distDir + "/translations/qtdeclarative_da.qm",
"./" + distDir + "/translations/qtdeclarative_de.qm",
"./" + distDir + "/translations/qtdeclarative_en.qm",
"./" + distDir + "/translations/qtdeclarative_es.qm",
"./" + distDir + "/translations/qtdeclarative_fi.qm",
"./" + distDir + "/translations/qtdeclarative_fr.qm",
"./" + distDir + "/translations/qtdeclarative_hu.qm",
"./" + distDir + "/translations/qtdeclarative_ja.qm",
"./" + distDir + "/translations/qtdeclarative_ko.qm",
"./" + distDir + "/translations/qtdeclarative_lv.qm",
"./" + distDir + "/translations/qtdeclarative_pl.qm",
"./" + distDir + "/translations/qtdeclarative_ru.qm",
"./" + distDir + "/translations/qtdeclarative_sk.qm",
"./" + distDir + "/translations/qtdeclarative_uk.qm",
"./" + distDir + "/translations/qtdeclarative_tr.qm",
}
);
#else

24
UnitTests/tst_deploytest.cpp
View File

@ -512,30 +512,6 @@ void deploytest::testMSVC() {
}
void deploytest::testEmptyParamsString() {
//#ifdef QT_DEBUG
// TestUtils utils;
// QDir("./" + DISTRO_DIR).removeRecursively();
// auto comapareTree = TestModule.testEmptyParamsTree();
// runTestParams({}, &comapareTree);
// auto emptyTree = utils.createTree({});
// runTestParams({"clear"}, &emptyTree);
// comapareTree = TestModule.testEmptyParamsTree("testDeployDir");
// runTestParams({"-bin", "./UnitTests",
// "-targetDir", "./testDeployDir"}, &comapareTree);
// comapareTree = utils.createTree({});
// runTestParams({"clear", "-targetDir", "./testDeployDir"}, &comapareTree);
//#endif
}
void deploytest::testWebEngine() {