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

added first qt6 module

Browse Source
This commit is contained in:
Andrei Yankovich 2022-08-24 22:55:22 +03:00
parent 3ca4e577ce
commit 0c7d3f41ed
12 changed files with 246 additions and 2 deletions

3
tests/CMakeLists.txt

@ -13,10 +13,13 @@ set(CURRENT_PROJECT "${PROJECT_NAME}-${CURRENT_PROJECT_DIR}")
file(GLOB_RECURSE SOURCE_CPP
"*.cpp" "*.h" "*.qrc"
"units/*.cpp" "units/*.h"
"modules/*.cpp" "modules/*.h"
)
set(PUBLIC_INCUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
set(PUBLIC_INCUDE_DIR ${PUBLIC_INCUDE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/units")
set(PUBLIC_INCUDE_DIR ${PUBLIC_INCUDE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/modules")
get_filename_component(QT_QT_ROOT "${Qt${QT_VERSION_MAJOR}Core_DIR}/../../.." ABSOLUTE)

0
tests/units/modulesqt513.cpp → tests/modules/modulesqt513.cpp

0
tests/units/modulesqt513.h → tests/modules/modulesqt513.h

0
tests/units/modulesqt514.cpp → tests/modules/modulesqt514.cpp

0
tests/units/modulesqt514.h → tests/modules/modulesqt514.h

0
tests/units/modulesqt515.cpp → tests/modules/modulesqt515.cpp

0
tests/units/modulesqt515.h → tests/modules/modulesqt515.h

0
tests/units/modulesqt5152.cpp → tests/modules/modulesqt5152.cpp

0
tests/units/modulesqt5152.h → tests/modules/modulesqt5152.h

208
tests/modules/modulesqt6_3.cpp Normal file

@ -0,0 +1,208 @@
#include "modulesqt6_3.h"
ModulesQt63::ModulesQt63() {
}
QSet<QString> ModulesQt63::qmlLibs(const QString &distDir) const {
TestUtils utils;
auto res = ModulesQt5152::qmlLibs(distDir);
return res;
}
QSet<QString> ModulesQt63::testDistroLibs(const QString &distDir) const {
TestUtils utils;
auto res = ModulesQt5152::testDistroLibs(distDir);
return res;
}
QSet<QString> ModulesQt63::testOutLibs(const QString &distDir) const {
TestUtils utils;
auto res = ModulesQt5152::testOutLibs(distDir);
return res;
}
QSet<QString> ModulesQt63::qtLibs(const QString &distDir) const {
TestUtils utils;
auto Tree = onlyC(distDir);
Tree = ignoreFilter(Tree, "/TestOnlyC");
#ifdef Q_OS_WIN
Tree += utils.createTree(
{
"./" + distDir + "QtWidgetsProject.sh",
"./" + distDir + "bin/QtWidgetsProject",
"./" + distDir + "bin/qt.conf",
"./" + distDir + "/Qt6Core.so",
"./" + distDir + "/Qt6DBus.so",
"./" + distDir + "/Qt6EglFSDeviceIntegration.so",
"./" + distDir + "/Qt6Gui.so",
"./" + distDir + "/Qt6Network.so",
"./" + distDir + "/Qt6OpenGL.so",
"./" + distDir + "/Qt6Pdf.so",
"./" + distDir + "/Qt6Svg.so",
"./" + distDir + "/Qt6WaylandClient.so",
"./" + distDir + "/Qt6WaylandEglClientHwIntegration.so",
"./" + distDir + "/Qt6Widgets.so",
"./" + distDir + "/Qt6WlShellIntegration.so",
"./" + distDir + "/Qt6XcbQpa.so",
"./" + distDir + "lib/libicudata.so",
"./" + distDir + "lib/libicui18n.so",
"./" + distDir + "lib/libicuuc.so",
"./" + distDir + "plugins/iconengines/libqsvgicon.so",
"./" + distDir + "plugins/imageformats/libqgif.so",
"./" + distDir + "plugins/imageformats/libqicns.so",
"./" + distDir + "plugins/imageformats/libqico.so",
"./" + distDir + "plugins/imageformats/libqjpeg.so",
"./" + distDir + "plugins/imageformats/libqpdf.so",
"./" + distDir + "plugins/imageformats/libqsvg.so",
"./" + distDir + "plugins/imageformats/libqtga.so",
"./" + distDir + "plugins/imageformats/libqtiff.so",
"./" + distDir + "plugins/imageformats/libqwbmp.so",
"./" + distDir + "plugins/imageformats/libqwebp.so",
"./" + distDir + "plugins/platforminputcontexts/libcomposeplatforminputcontextplugin.so",
"./" + distDir + "plugins/platforminputcontexts/libibusplatforminputcontextplugin.so",
"./" + distDir + "plugins/platforms/libqeglfs.so",
"./" + distDir + "plugins/platforms/libqlinuxfb.so",
"./" + distDir + "plugins/platforms/libqminimal.so",
"./" + distDir + "plugins/platforms/libqminimalegl.so",
"./" + distDir + "plugins/platforms/libqoffscreen.so",
"./" + distDir + "plugins/platforms/libqwayland-egl.so",
"./" + distDir + "plugins/platforms/libqwayland-generic.so",
"./" + distDir + "plugins/platforms/libqxcb.so",
"./" + distDir + "plugins/platformthemes/libqgtk3.so",
"./" + distDir + "plugins/platformthemes/libqxdgdesktopportal.so",
"./" + distDir + "plugins/wayland-shell-integration/libfullscreen-shell-v1.so",
"./" + distDir + "plugins/wayland-shell-integration/libivi-shell.so",
"./" + distDir + "plugins/wayland-shell-integration/libqt-shell.so",
"./" + distDir + "plugins/wayland-shell-integration/libwl-shell-plugin.so",
"./" + distDir + "plugins/wayland-shell-integration/libxdg-shell.so",
"./" + distDir + "plugins/xcbglintegrations/libqxcb-egl-integration.so",
"./" + distDir + "plugins/xcbglintegrations/libqxcb-glx-integration.so",
"./" + distDir + "translations/qtbase_ar.qm",
"./" + distDir + "translations/qtbase_bg.qm",
"./" + distDir + "translations/qtbase_ca.qm",
"./" + distDir + "translations/qtbase_cs.qm",
"./" + distDir + "translations/qtbase_da.qm",
"./" + distDir + "translations/qtbase_de.qm",
"./" + distDir + "translations/qtbase_en.qm",
"./" + distDir + "translations/qtbase_es.qm",
"./" + distDir + "translations/qtbase_fa.qm",
"./" + distDir + "translations/qtbase_fi.qm",
"./" + distDir + "translations/qtbase_fr.qm",
"./" + distDir + "translations/qtbase_gd.qm",
"./" + distDir + "translations/qtbase_he.qm",
"./" + distDir + "translations/qtbase_hr.qm",
"./" + distDir + "translations/qtbase_hu.qm",
"./" + distDir + "translations/qtbase_it.qm",
"./" + distDir + "translations/qtbase_ja.qm",
"./" + distDir + "translations/qtbase_ko.qm",
"./" + distDir + "translations/qtbase_lv.qm",
"./" + distDir + "translations/qtbase_nl.qm",
"./" + distDir + "translations/qtbase_nn.qm",
"./" + distDir + "translations/qtbase_pl.qm",
"./" + distDir + "translations/qtbase_pt_BR.qm",
"./" + distDir + "translations/qtbase_ru.qm",
"./" + distDir + "translations/qtbase_sk.qm",
"./" + distDir + "translations/qtbase_tr.qm",
"./" + distDir + "translations/qtbase_uk.qm",
"./" + distDir + "translations/qtbase_zh_CN.qm",
"./" + distDir + "translations/qtbase_zh_TW.qm"
});
#else
Tree += utils.createTree(
{
"./" + distDir + "QtWidgetsProject.sh",
"./" + distDir + "bin/QtWidgetsProject",
"./" + distDir + "bin/qt.conf",
"./" + distDir + "lib/libQt6Core.so",
"./" + distDir + "lib/libQt6DBus.so",
"./" + distDir + "lib/libQt6EglFSDeviceIntegration.so",
"./" + distDir + "lib/libQt6Gui.so",
"./" + distDir + "lib/libQt6Network.so",
"./" + distDir + "lib/libQt6OpenGL.so",
"./" + distDir + "lib/libQt6Pdf.so",
"./" + distDir + "lib/libQt6Svg.so",
"./" + distDir + "lib/libQt6WaylandClient.so",
"./" + distDir + "lib/libQt6WaylandEglClientHwIntegration.so",
"./" + distDir + "lib/libQt6Widgets.so",
"./" + distDir + "lib/libQt6WlShellIntegration.so",
"./" + distDir + "lib/libQt6XcbQpa.so",
"./" + distDir + "lib/libicudata.so",
"./" + distDir + "lib/libicui18n.so",
"./" + distDir + "lib/libicuuc.so",
"./" + distDir + "plugins/iconengines/libqsvgicon.so",
"./" + distDir + "plugins/imageformats/libqgif.so",
"./" + distDir + "plugins/imageformats/libqicns.so",
"./" + distDir + "plugins/imageformats/libqico.so",
"./" + distDir + "plugins/imageformats/libqjpeg.so",
"./" + distDir + "plugins/imageformats/libqpdf.so",
"./" + distDir + "plugins/imageformats/libqsvg.so",
"./" + distDir + "plugins/imageformats/libqtga.so",
"./" + distDir + "plugins/imageformats/libqtiff.so",
"./" + distDir + "plugins/imageformats/libqwbmp.so",
"./" + distDir + "plugins/imageformats/libqwebp.so",
"./" + distDir + "plugins/platforminputcontexts/libcomposeplatforminputcontextplugin.so",
"./" + distDir + "plugins/platforminputcontexts/libibusplatforminputcontextplugin.so",
"./" + distDir + "plugins/platforms/libqeglfs.so",
"./" + distDir + "plugins/platforms/libqlinuxfb.so",
"./" + distDir + "plugins/platforms/libqminimal.so",
"./" + distDir + "plugins/platforms/libqminimalegl.so",
"./" + distDir + "plugins/platforms/libqoffscreen.so",
"./" + distDir + "plugins/platforms/libqwayland-egl.so",
"./" + distDir + "plugins/platforms/libqwayland-generic.so",
"./" + distDir + "plugins/platforms/libqxcb.so",
"./" + distDir + "plugins/platformthemes/libqgtk3.so",
"./" + distDir + "plugins/platformthemes/libqxdgdesktopportal.so",
"./" + distDir + "plugins/wayland-shell-integration/libfullscreen-shell-v1.so",
"./" + distDir + "plugins/wayland-shell-integration/libivi-shell.so",
"./" + distDir + "plugins/wayland-shell-integration/libqt-shell.so",
"./" + distDir + "plugins/wayland-shell-integration/libwl-shell-plugin.so",
"./" + distDir + "plugins/wayland-shell-integration/libxdg-shell.so",
"./" + distDir + "plugins/xcbglintegrations/libqxcb-egl-integration.so",
"./" + distDir + "plugins/xcbglintegrations/libqxcb-glx-integration.so",
"./" + distDir + "translations/qtbase_ar.qm",
"./" + distDir + "translations/qtbase_bg.qm",
"./" + distDir + "translations/qtbase_ca.qm",
"./" + distDir + "translations/qtbase_cs.qm",
"./" + distDir + "translations/qtbase_da.qm",
"./" + distDir + "translations/qtbase_de.qm",
"./" + distDir + "translations/qtbase_en.qm",
"./" + distDir + "translations/qtbase_es.qm",
"./" + distDir + "translations/qtbase_fa.qm",
"./" + distDir + "translations/qtbase_fi.qm",
"./" + distDir + "translations/qtbase_fr.qm",
"./" + distDir + "translations/qtbase_gd.qm",
"./" + distDir + "translations/qtbase_he.qm",
"./" + distDir + "translations/qtbase_hr.qm",
"./" + distDir + "translations/qtbase_hu.qm",
"./" + distDir + "translations/qtbase_it.qm",
"./" + distDir + "translations/qtbase_ja.qm",
"./" + distDir + "translations/qtbase_ko.qm",
"./" + distDir + "translations/qtbase_lv.qm",
"./" + distDir + "translations/qtbase_nl.qm",
"./" + distDir + "translations/qtbase_nn.qm",
"./" + distDir + "translations/qtbase_pl.qm",
"./" + distDir + "translations/qtbase_pt_BR.qm",
"./" + distDir + "translations/qtbase_ru.qm",
"./" + distDir + "translations/qtbase_sk.qm",
"./" + distDir + "translations/qtbase_tr.qm",
"./" + distDir + "translations/qtbase_uk.qm",
"./" + distDir + "translations/qtbase_zh_CN.qm",
"./" + distDir + "translations/qtbase_zh_TW.qm"
}
);
#endif
return Tree;
}

30
tests/modules/modulesqt6_3.h Normal file

@ -0,0 +1,30 @@
#ifndef MODULESQT6_3_H
#define MODULESQT6_3_H
#include "modulesqt5152.h"
class ModulesQt63: public ModulesQt5152
{
public:
ModulesQt63();
// ModulesQt6.3 interface
public:
QSet<QString> qmlLibs(const QString &distDir = DISTRO_DIR) const override;
QSet<QString> testDistroLibs(const QString &distDir = DISTRO_DIR) const override;
QSet<QString> testOutLibs(const QString &distDir = DISTRO_DIR) const override;
// ModulesQt513 interface
public:
QSet<QString> ignoreFilter(const QSet<QString> &input, const QString &filter) const override;
QSet<QString> replace(const QSet<QString> &data, const QMap<QString, QString> &replaceMap) const override;
QSet<QString> onlyC(const QString &distDir) const override;
QSet<QString> qtLibs(const QString &distDir) const override;
QSet<QString> qmlVirtualKeyBoadrLibs(const QString &distDir) const override;
QSet<QString> qtWithoutTr(const QString &distDir) const override;
QSet<QString> qtWebEngine(const QString &distDir) const override;
QSet<QString> qtWebEngineWidgets(const QString &distDir) const override;
QSet<QString> testEmptyParamsTree(const QString &distDir) const override;
};
#endif // MODULESQT6_3_H

7
tests/units/modules.h

@ -8,11 +8,14 @@
#ifndef MODULES_H
#define MODULES_H
#include "testutils.h"
#include <configparser.h>
#include <QSet>
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 2)
#if QT_VERSION >= QT_VERSION_CHECK(6, 3, 0)
#include "modulesqt6_3.h"
class Modules : public ModulesQt63
#elif QT_VERSION >= QT_VERSION_CHECK(5, 15, 2)
#include "modulesqt5152.h"
class Modules : public ModulesQt5152