QuasarApp/CQtDeployer
4
1
Fork 0
mirror of https://github.com/QuasarApp/CQtDeployer.git synced 2025-04-27 18:24:33 +00:00
Code Issues Projects Releases Wiki Activity

added base support of qt 5.14 for windows

Browse Source
This commit is contained in:
a.yankovich 2020-02-07 18:09:53 +03:00
parent 36f9413a5a
commit d26a6ef669
2 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
UnitTests/modulesqt514.cpp
View File

@ -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"},

11
UnitTests/tst_deploytest.cpp
View File

@ -2041,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"