From 9940e8c19e57e0d9000ba1d6d08c7cfc55c8429e Mon Sep 17 00:00:00 2001 From: EndrII Date: Sun, 16 Aug 2020 13:18:46 +0300 Subject: [PATCH] added support qt 5.15 --- UnitTests/UnitTests.pro | 2 + UnitTests/modules.h | 6 +- UnitTests/modulesqt515.cpp | 193 +++++++++++++++++++++++++++++++++++++ UnitTests/modulesqt515.h | 23 +++++ 4 files changed, 223 insertions(+), 1 deletion(-) create mode 100644 UnitTests/modulesqt515.cpp create mode 100644 UnitTests/modulesqt515.h diff --git a/UnitTests/UnitTests.pro b/UnitTests/UnitTests.pro index dd3b0a8..80fc8a8 100644 --- a/UnitTests/UnitTests.pro +++ b/UnitTests/UnitTests.pro @@ -34,6 +34,7 @@ SOURCES += tst_deploytest.cpp \ modules.cpp \ modulesqt513.cpp \ modulesqt514.cpp \ + modulesqt515.cpp \ qmlcreator.cpp \ testutils.cpp @@ -45,5 +46,6 @@ HEADERS += \ modules.h \ modulesqt513.h \ modulesqt514.h \ + modulesqt515.h \ qmlcreator.h \ testutils.h diff --git a/UnitTests/modules.h b/UnitTests/modules.h index 5641a62..7412ca7 100644 --- a/UnitTests/modules.h +++ b/UnitTests/modules.h @@ -12,7 +12,11 @@ #include #include -#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) +#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0) + #include "modulesqt515.h" + class Modules : public ModulesQt515 + +#elif QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) #include "modulesqt514.h" class Modules : public ModulesQt514 diff --git a/UnitTests/modulesqt515.cpp b/UnitTests/modulesqt515.cpp new file mode 100644 index 0000000..e8f590f --- /dev/null +++ b/UnitTests/modulesqt515.cpp @@ -0,0 +1,193 @@ +#include "modulesqt515.h" + +ModulesQt515::ModulesQt515() +{ + +} + +QSet ModulesQt515::onlyC(const QString &distDir) const { + + TestUtils utils; + auto res = ModulesQt514::onlyC(distDir); + return res; +} + +QSet ModulesQt515::qtLibs(const QString &distDir) const { + TestUtils utils; + auto res = ModulesQt514::qtLibs(distDir); + +#ifdef Q_OS_WIN + res -= utils.createTree({ + }); +#else + res += utils.createTree({ + }); +#endif + + return res; +} + +QSet ModulesQt515::qmlLibs(const QString &distDir) const { + + TestUtils utils; + + auto res = ModulesQt514::qmlLibs(distDir); + +#ifdef Q_OS_WIN + res += utils.createTree({ + + }); +#else + res -= utils.createTree({ + "./" + distDir + "/plugins/wayland-graphics-integration-server/libdmabuf-server.so", + "./" + distDir + "/plugins/wayland-graphics-integration-server/libdrm-egl-server.so", + "./" + distDir + "/plugins/wayland-graphics-integration-server/liblinux-dmabuf-unstable-v1.so", + "./" + distDir + "/plugins/wayland-graphics-integration-server/libqt-plugin-wayland-egl.so", + "./" + distDir + "/plugins/wayland-graphics-integration-server/libshm-emulation-server.so", + "./" + distDir + "/plugins/wayland-graphics-integration-server/libvulkan-server.so", + "./" + distDir + "/plugins/wayland-graphics-integration-server/libwayland-eglstream-controller.so", + "./" + distDir + "/plugins/wayland-graphics-integration-server/libxcomposite-egl.so", + "./" + distDir + "/plugins/wayland-graphics-integration-server/libxcomposite-glx.so" + }); + + res += utils.createTree({ + "./" + 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 + "/qml/QtQuick/Controls.2/Fusion/HorizontalHeaderView.qml", + "./" + distDir + "/qml/QtQuick/Controls.2/Fusion/VerticalHeaderView.qml", + "./" + distDir + "/qml/QtQuick/Controls.2/HorizontalHeaderView.qml", + "./" + distDir + "/qml/QtQuick/Controls.2/Imagine/HorizontalHeaderView.qml", + "./" + distDir + "/qml/QtQuick/Controls.2/Imagine/VerticalHeaderView.qml", + "./" + distDir + "/qml/QtQuick/Controls.2/Material/HorizontalHeaderView.qml", + "./" + distDir + "/qml/QtQuick/Controls.2/Material/VerticalHeaderView.qml", + "./" + distDir + "/qml/QtQuick/Controls.2/Universal/HorizontalHeaderView.qml", + "./" + distDir + "/qml/QtQuick/Controls.2/Universal/VerticalHeaderView.qml", + "./" + distDir + "/qml/QtQuick/Controls.2/VerticalHeaderView.qml" + } +); +#endif + return res; +} + +QSet ModulesQt515::qtWithoutTr(const QString &distDir) const { + TestUtils utils; + auto res = ModulesQt514::qtWithoutTr(distDir); + +#ifdef Q_OS_WIN + res += utils.createTree({ + }); +#else + res += utils.createTree({ + }); +#endif + return res; +} + +QSet ModulesQt515::qtWebEngine(const QString &distDir) const { + TestUtils utils; + + auto res = ModulesQt514::qtWebEngine(distDir); + +#ifdef Q_OS_WIN +#else + res -= utils.createTree({ + "./" + distDir + "/plugins/wayland-graphics-integration-server/libvulkan-server.so" + }); +#endif + return res; +} + +QSet ModulesQt515::testDistroLibs(const QString &distDir) const { + TestUtils utils; + + auto res = ModulesQt514::testDistroLibs(distDir); + +#ifdef Q_OS_WIN +#else + res += utils.createTree({ + "./" + distDir + "/package2/ZzZ/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-dmabuf-server-buffer.so", + "./" + distDir + "/package2/ZzZ/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-drm-egl-server-buffer.so", + "./" + distDir + "/package2/ZzZ/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-linux-dmabuf-unstable-v1.so", + "./" + distDir + "/package2/ZzZ/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-shm-emulation-server.so", + "./" + distDir + "/package2/ZzZ/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-vulkan-server.so", + "./" + distDir + "/package2/ZzZ/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-wayland-egl.so", + "./" + distDir + "/package2/ZzZ/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-wayland-eglstream-controller.so", + "./" + distDir + "/package2/ZzZ/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-xcomposite-egl.so", + "./" + distDir + "/package2/ZzZ/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-xcomposite-glx.so", + "./" + distDir + "/package2/ZzZ/q/and/q/QtQuick/Controls.2/Fusion/HorizontalHeaderView.qml", + "./" + distDir + "/package2/ZzZ/q/and/q/QtQuick/Controls.2/Fusion/VerticalHeaderView.qml", + "./" + distDir + "/package2/ZzZ/q/and/q/QtQuick/Controls.2/HorizontalHeaderView.qml", + "./" + distDir + "/package2/ZzZ/q/and/q/QtQuick/Controls.2/Imagine/HorizontalHeaderView.qml", + "./" + distDir + "/package2/ZzZ/q/and/q/QtQuick/Controls.2/Imagine/VerticalHeaderView.qml", + "./" + distDir + "/package2/ZzZ/q/and/q/QtQuick/Controls.2/Material/HorizontalHeaderView.qml", + "./" + distDir + "/package2/ZzZ/q/and/q/QtQuick/Controls.2/Material/VerticalHeaderView.qml", + "./" + distDir + "/package2/ZzZ/q/and/q/QtQuick/Controls.2/Universal/HorizontalHeaderView.qml", + "./" + distDir + "/package2/ZzZ/q/and/q/QtQuick/Controls.2/Universal/VerticalHeaderView.qml", + "./" + distDir + "/package2/ZzZ/q/and/q/QtQuick/Controls.2/VerticalHeaderView.qml" + }); + + res -= utils.createTree({ + "./" + distDir + "/package2/ZzZ/plugins/wayland-graphics-integration-server/libdmabuf-server.so", + "./" + distDir + "/package2/ZzZ/plugins/wayland-graphics-integration-server/libdrm-egl-server.so", + "./" + distDir + "/package2/ZzZ/plugins/wayland-graphics-integration-server/liblinux-dmabuf-unstable-v1.so", + "./" + distDir + "/package2/ZzZ/plugins/wayland-graphics-integration-server/libqt-plugin-wayland-egl.so", + "./" + distDir + "/package2/ZzZ/plugins/wayland-graphics-integration-server/libshm-emulation-server.so", + "./" + distDir + "/package2/ZzZ/plugins/wayland-graphics-integration-server/libvulkan-server.so", + "./" + distDir + "/package2/ZzZ/plugins/wayland-graphics-integration-server/libwayland-eglstream-controller.so", + "./" + distDir + "/package2/ZzZ/plugins/wayland-graphics-integration-server/libxcomposite-egl.so", + "./" + distDir + "/package2/ZzZ/plugins/wayland-graphics-integration-server/libxcomposite-glx.so" + }); +#endif + return res; +} + +QSet ModulesQt515::testOutLibs(const QString &distDir) const { + TestUtils utils; + + auto res = ModulesQt514::testOutLibs(distDir); + +#ifdef Q_OS_WIN +#else + res += utils.createTree({ + "./" + distDir + "/q/QtQuick/Controls.2/Fusion/HorizontalHeaderView.qml", + "./" + distDir + "/q/QtQuick/Controls.2/Fusion/VerticalHeaderView.qml", + "./" + distDir + "/q/QtQuick/Controls.2/HorizontalHeaderView.qml", + "./" + distDir + "/q/QtQuick/Controls.2/Imagine/HorizontalHeaderView.qml", + "./" + distDir + "/q/QtQuick/Controls.2/Imagine/VerticalHeaderView.qml", + "./" + distDir + "/q/QtQuick/Controls.2/Material/HorizontalHeaderView.qml", + "./" + distDir + "/q/QtQuick/Controls.2/Material/VerticalHeaderView.qml", + "./" + distDir + "/q/QtQuick/Controls.2/Universal/HorizontalHeaderView.qml", + "./" + distDir + "/q/QtQuick/Controls.2/Universal/VerticalHeaderView.qml", + "./" + distDir + "/q/QtQuick/Controls.2/VerticalHeaderView.qml", + "./" + distDir + "/p/wayland-graphics-integration-server/libqt-wayland-compositor-dmabuf-server-buffer.so", + "./" + distDir + "/p/wayland-graphics-integration-server/libqt-wayland-compositor-drm-egl-server-buffer.so", + "./" + distDir + "/p/wayland-graphics-integration-server/libqt-wayland-compositor-linux-dmabuf-unstable-v1.so", + "./" + distDir + "/p/wayland-graphics-integration-server/libqt-wayland-compositor-shm-emulation-server.so", + "./" + distDir + "/p/wayland-graphics-integration-server/libqt-wayland-compositor-vulkan-server.so", + "./" + distDir + "/p/wayland-graphics-integration-server/libqt-wayland-compositor-wayland-egl.so", + "./" + distDir + "/p/wayland-graphics-integration-server/libqt-wayland-compositor-wayland-eglstream-controller.so", + "./" + distDir + "/p/wayland-graphics-integration-server/libqt-wayland-compositor-xcomposite-egl.so", + "./" + distDir + "/p/wayland-graphics-integration-server/libqt-wayland-compositor-xcomposite-glx.so" + }); + + res -= utils.createTree({ + "./" + distDir + "/p/wayland-graphics-integration-server/libdmabuf-server.so", + "./" + distDir + "/p/wayland-graphics-integration-server/libdrm-egl-server.so", + "./" + distDir + "/p/wayland-graphics-integration-server/liblinux-dmabuf-unstable-v1.so", + "./" + distDir + "/p/wayland-graphics-integration-server/libqt-plugin-wayland-egl.so", + "./" + distDir + "/p/wayland-graphics-integration-server/libshm-emulation-server.so", + "./" + distDir + "/p/wayland-graphics-integration-server/libvulkan-server.so", + "./" + distDir + "/p/wayland-graphics-integration-server/libwayland-eglstream-controller.so", + "./" + distDir + "/p/wayland-graphics-integration-server/libxcomposite-egl.so", + "./" + distDir + "/p/wayland-graphics-integration-server/libxcomposite-glx.so" + }); +#endif + return res; +} diff --git a/UnitTests/modulesqt515.h b/UnitTests/modulesqt515.h new file mode 100644 index 0000000..dd19122 --- /dev/null +++ b/UnitTests/modulesqt515.h @@ -0,0 +1,23 @@ +#ifndef MODULESQT515_H +#define MODULESQT515_H + +#include "modulesqt514.h" + +class ModulesQt515 : public ModulesQt514 +{ +public: + ModulesQt515(); + + // ModulesQt513 interface +public: + QSet onlyC(const QString &distDir = DISTRO_DIR) const override; + QSet qtLibs(const QString &distDir = DISTRO_DIR) const override; + QSet qmlLibs(const QString &distDir = DISTRO_DIR) const override; + QSet qtWithoutTr(const QString &distDir = DISTRO_DIR) const override; + QSet qtWebEngine(const QString &distDir = DISTRO_DIR) const override; + QSet testDistroLibs(const QString &distDir = DISTRO_DIR) const override; + QSet testOutLibs(const QString &distDir = DISTRO_DIR) const override; + +}; + +#endif // MODULESQT515_H