From 58a8e6f06167ec10e15bd5d6d9a101d490e53f3e Mon Sep 17 00:00:00 2001 From: EndrII Date: Mon, 5 Feb 2024 19:28:56 +0100 Subject: [PATCH 1/2] fix linux tests --- tests/modules/modulesqt6_5.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/modules/modulesqt6_5.cpp b/tests/modules/modulesqt6_5.cpp index 66b40f79..37573b7c 100644 --- a/tests/modules/modulesqt6_5.cpp +++ b/tests/modules/modulesqt6_5.cpp @@ -77,6 +77,13 @@ QSet ModulesQt6_5::qtLibs(const QString &distDir) const { "./" + distDir + "/plugins/platforms/qdirect2d.dll", } ); +#else + Tree += utils.createTree( + { + "./" + distDir + "/plugins/networkinformation/libqglib.so", + } + ); + #endif return Tree; From 0463e331035888a23fd93253e3de6116409c1cc6 Mon Sep 17 00:00:00 2001 From: EndrII Date: Mon, 5 Feb 2024 21:55:17 +0100 Subject: [PATCH 2/2] change libqglib location in linux tests --- tests/modules/modulesqt6_5.cpp | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/tests/modules/modulesqt6_5.cpp b/tests/modules/modulesqt6_5.cpp index 37573b7c..b155b663 100644 --- a/tests/modules/modulesqt6_5.cpp +++ b/tests/modules/modulesqt6_5.cpp @@ -22,7 +22,7 @@ QSet ModulesQt6_5::qmlLibs(const QString &distDir) const { "./" + distDir + "/qml/QtQml/libqmlplugin.so", "./" + distDir + "/qml/QtQml/plugins.qmltypes" } - ); + ); #ifdef Q_OS_WIN Tree += utils.createTree( @@ -43,6 +43,7 @@ QSet ModulesQt6_5::qmlLibs(const QString &distDir) const { "./" + distDir + "/qml/QtQml/Base/plugins.qmltypes", "./" + distDir + "/qml/QtQml/Base/qmldir", "./" + distDir + "/qml/QtQml/libqmlmetaplugin.so", + "./" + distDir + "/plugins/networkinformation/libqglib.so", "./" + distDir + "/qml/QtQuick/Controls/Material/impl/RoundedElevationEffect.qml" } ); @@ -77,12 +78,6 @@ QSet ModulesQt6_5::qtLibs(const QString &distDir) const { "./" + distDir + "/plugins/platforms/qdirect2d.dll", } ); -#else - Tree += utils.createTree( - { - "./" + distDir + "/plugins/networkinformation/libqglib.so", - } - ); #endif @@ -95,5 +90,14 @@ QSet ModulesQt6_5::qtWebEngineWidgets(const QString &distDir) const auto Tree = ModulesQt6_4::qtWebEngineWidgets(distDir); +#ifdef Q_OS_LINUX + Tree += utils.createTree( + { + "./" + distDir + "/plugins/networkinformation/libqglib.so", + } + ); +#endif + + return Tree; }