Skip to content

Commit 9940e8c

Browse files
EndrIIEndrII
committed
added support qt 5.15
1 parent ec665f9 commit 9940e8c

File tree

4 files changed

+223
-1
lines changed

4 files changed

+223
-1
lines changed

‎UnitTests/UnitTests.pro‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ SOURCES += tst_deploytest.cpp \
3434
modules.cpp \
3535
modulesqt513.cpp \
3636
modulesqt514.cpp \
37+
modulesqt515.cpp \
3738
qmlcreator.cpp \
3839
testutils.cpp
3940

@@ -45,5 +46,6 @@ HEADERS += \
4546
modules.h \
4647
modulesqt513.h \
4748
modulesqt514.h \
49+
modulesqt515.h \
4850
qmlcreator.h \
4951
testutils.h

‎UnitTests/modules.h‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@
1212
#include <configparser.h>
1313
#include <QSet>
1414

15-
#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
15+
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
16+
#include "modulesqt515.h"
17+
class Modules : public ModulesQt515
18+
19+
#elif QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
1620
#include "modulesqt514.h"
1721
class Modules : public ModulesQt514
1822

‎UnitTests/modulesqt515.cpp‎

Lines changed: 193 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,193 @@
1+
#include "modulesqt515.h"
2+
3+
ModulesQt515::ModulesQt515()
4+
{
5+
6+
}
7+
8+
QSet<QString> ModulesQt515::onlyC(const QString &distDir) const {
9+
10+
TestUtils utils;
11+
auto res = ModulesQt514::onlyC(distDir);
12+
return res;
13+
}
14+
15+
QSet<QString> ModulesQt515::qtLibs(const QString &distDir) const {
16+
TestUtils utils;
17+
auto res = ModulesQt514::qtLibs(distDir);
18+
19+
#ifdef Q_OS_WIN
20+
res -= utils.createTree({
21+
});
22+
#else
23+
res += utils.createTree({
24+
});
25+
#endif
26+
27+
return res;
28+
}
29+
30+
QSet<QString> ModulesQt515::qmlLibs(const QString &distDir) const {
31+
32+
TestUtils utils;
33+
34+
auto res = ModulesQt514::qmlLibs(distDir);
35+
36+
#ifdef Q_OS_WIN
37+
res += utils.createTree({
38+
39+
});
40+
#else
41+
res -= utils.createTree({
42+
"./" + distDir + "/plugins/wayland-graphics-integration-server/libdmabuf-server.so",
43+
"./" + distDir + "/plugins/wayland-graphics-integration-server/libdrm-egl-server.so",
44+
"./" + distDir + "/plugins/wayland-graphics-integration-server/liblinux-dmabuf-unstable-v1.so",
45+
"./" + distDir + "/plugins/wayland-graphics-integration-server/libqt-plugin-wayland-egl.so",
46+
"./" + distDir + "/plugins/wayland-graphics-integration-server/libshm-emulation-server.so",
47+
"./" + distDir + "/plugins/wayland-graphics-integration-server/libvulkan-server.so",
48+
"./" + distDir + "/plugins/wayland-graphics-integration-server/libwayland-eglstream-controller.so",
49+
"./" + distDir + "/plugins/wayland-graphics-integration-server/libxcomposite-egl.so",
50+
"./" + distDir + "/plugins/wayland-graphics-integration-server/libxcomposite-glx.so"
51+
});
52+
53+
res += utils.createTree({
54+
"./" + distDir + "/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-dmabuf-server-buffer.so",
55+
"./" + distDir + "/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-drm-egl-server-buffer.so",
56+
"./" + distDir + "/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-linux-dmabuf-unstable-v1.so",
57+
"./" + distDir + "/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-shm-emulation-server.so",
58+
"./" + distDir + "/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-vulkan-server.so",
59+
"./" + distDir + "/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-wayland-egl.so",
60+
"./" + distDir + "/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-wayland-eglstream-controller.so",
61+
"./" + distDir + "/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-xcomposite-egl.so",
62+
"./" + distDir + "/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-xcomposite-glx.so",
63+
"./" + distDir + "/qml/QtQuick/Controls.2/Fusion/HorizontalHeaderView.qml",
64+
"./" + distDir + "/qml/QtQuick/Controls.2/Fusion/VerticalHeaderView.qml",
65+
"./" + distDir + "/qml/QtQuick/Controls.2/HorizontalHeaderView.qml",
66+
"./" + distDir + "/qml/QtQuick/Controls.2/Imagine/HorizontalHeaderView.qml",
67+
"./" + distDir + "/qml/QtQuick/Controls.2/Imagine/VerticalHeaderView.qml",
68+
"./" + distDir + "/qml/QtQuick/Controls.2/Material/HorizontalHeaderView.qml",
69+
"./" + distDir + "/qml/QtQuick/Controls.2/Material/VerticalHeaderView.qml",
70+
"./" + distDir + "/qml/QtQuick/Controls.2/Universal/HorizontalHeaderView.qml",
71+
"./" + distDir + "/qml/QtQuick/Controls.2/Universal/VerticalHeaderView.qml",
72+
"./" + distDir + "/qml/QtQuick/Controls.2/VerticalHeaderView.qml"
73+
}
74+
);
75+
#endif
76+
return res;
77+
}
78+
79+
QSet<QString> ModulesQt515::qtWithoutTr(const QString &distDir) const {
80+
TestUtils utils;
81+
auto res = ModulesQt514::qtWithoutTr(distDir);
82+
83+
#ifdef Q_OS_WIN
84+
res += utils.createTree({
85+
});
86+
#else
87+
res += utils.createTree({
88+
});
89+
#endif
90+
return res;
91+
}
92+
93+
QSet<QString> ModulesQt515::qtWebEngine(const QString &distDir) const {
94+
TestUtils utils;
95+
96+
auto res = ModulesQt514::qtWebEngine(distDir);
97+
98+
#ifdef Q_OS_WIN
99+
#else
100+
res -= utils.createTree({
101+
"./" + distDir + "/plugins/wayland-graphics-integration-server/libvulkan-server.so"
102+
});
103+
#endif
104+
return res;
105+
}
106+
107+
QSet<QString> ModulesQt515::testDistroLibs(const QString &distDir) const {
108+
TestUtils utils;
109+
110+
auto res = ModulesQt514::testDistroLibs(distDir);
111+
112+
#ifdef Q_OS_WIN
113+
#else
114+
res += utils.createTree({
115+
"./" + distDir + "/package2/ZzZ/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-dmabuf-server-buffer.so",
116+
"./" + distDir + "/package2/ZzZ/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-drm-egl-server-buffer.so",
117+
"./" + distDir + "/package2/ZzZ/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-linux-dmabuf-unstable-v1.so",
118+
"./" + distDir + "/package2/ZzZ/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-shm-emulation-server.so",
119+
"./" + distDir + "/package2/ZzZ/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-vulkan-server.so",
120+
"./" + distDir + "/package2/ZzZ/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-wayland-egl.so",
121+
"./" + distDir + "/package2/ZzZ/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-wayland-eglstream-controller.so",
122+
"./" + distDir + "/package2/ZzZ/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-xcomposite-egl.so",
123+
"./" + distDir + "/package2/ZzZ/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-xcomposite-glx.so",
124+
"./" + distDir + "/package2/ZzZ/q/and/q/QtQuick/Controls.2/Fusion/HorizontalHeaderView.qml",
125+
"./" + distDir + "/package2/ZzZ/q/and/q/QtQuick/Controls.2/Fusion/VerticalHeaderView.qml",
126+
"./" + distDir + "/package2/ZzZ/q/and/q/QtQuick/Controls.2/HorizontalHeaderView.qml",
127+
"./" + distDir + "/package2/ZzZ/q/and/q/QtQuick/Controls.2/Imagine/HorizontalHeaderView.qml",
128+
"./" + distDir + "/package2/ZzZ/q/and/q/QtQuick/Controls.2/Imagine/VerticalHeaderView.qml",
129+
"./" + distDir + "/package2/ZzZ/q/and/q/QtQuick/Controls.2/Material/HorizontalHeaderView.qml",
130+
"./" + distDir + "/package2/ZzZ/q/and/q/QtQuick/Controls.2/Material/VerticalHeaderView.qml",
131+
"./" + distDir + "/package2/ZzZ/q/and/q/QtQuick/Controls.2/Universal/HorizontalHeaderView.qml",
132+
"./" + distDir + "/package2/ZzZ/q/and/q/QtQuick/Controls.2/Universal/VerticalHeaderView.qml",
133+
"./" + distDir + "/package2/ZzZ/q/and/q/QtQuick/Controls.2/VerticalHeaderView.qml"
134+
});
135+
136+
res -= utils.createTree({
137+
"./" + distDir + "/package2/ZzZ/plugins/wayland-graphics-integration-server/libdmabuf-server.so",
138+
"./" + distDir + "/package2/ZzZ/plugins/wayland-graphics-integration-server/libdrm-egl-server.so",
139+
"./" + distDir + "/package2/ZzZ/plugins/wayland-graphics-integration-server/liblinux-dmabuf-unstable-v1.so",
140+
"./" + distDir + "/package2/ZzZ/plugins/wayland-graphics-integration-server/libqt-plugin-wayland-egl.so",
141+
"./" + distDir + "/package2/ZzZ/plugins/wayland-graphics-integration-server/libshm-emulation-server.so",
142+
"./" + distDir + "/package2/ZzZ/plugins/wayland-graphics-integration-server/libvulkan-server.so",
143+
"./" + distDir + "/package2/ZzZ/plugins/wayland-graphics-integration-server/libwayland-eglstream-controller.so",
144+
"./" + distDir + "/package2/ZzZ/plugins/wayland-graphics-integration-server/libxcomposite-egl.so",
145+
"./" + distDir + "/package2/ZzZ/plugins/wayland-graphics-integration-server/libxcomposite-glx.so"
146+
});
147+
#endif
148+
return res;
149+
}
150+
151+
QSet<QString> ModulesQt515::testOutLibs(const QString &distDir) const {
152+
TestUtils utils;
153+
154+
auto res = ModulesQt514::testOutLibs(distDir);
155+
156+
#ifdef Q_OS_WIN
157+
#else
158+
res += utils.createTree({
159+
"./" + distDir + "/q/QtQuick/Controls.2/Fusion/HorizontalHeaderView.qml",
160+
"./" + distDir + "/q/QtQuick/Controls.2/Fusion/VerticalHeaderView.qml",
161+
"./" + distDir + "/q/QtQuick/Controls.2/HorizontalHeaderView.qml",
162+
"./" + distDir + "/q/QtQuick/Controls.2/Imagine/HorizontalHeaderView.qml",
163+
"./" + distDir + "/q/QtQuick/Controls.2/Imagine/VerticalHeaderView.qml",
164+
"./" + distDir + "/q/QtQuick/Controls.2/Material/HorizontalHeaderView.qml",
165+
"./" + distDir + "/q/QtQuick/Controls.2/Material/VerticalHeaderView.qml",
166+
"./" + distDir + "/q/QtQuick/Controls.2/Universal/HorizontalHeaderView.qml",
167+
"./" + distDir + "/q/QtQuick/Controls.2/Universal/VerticalHeaderView.qml",
168+
"./" + distDir + "/q/QtQuick/Controls.2/VerticalHeaderView.qml",
169+
"./" + distDir + "/p/wayland-graphics-integration-server/libqt-wayland-compositor-dmabuf-server-buffer.so",
170+
"./" + distDir + "/p/wayland-graphics-integration-server/libqt-wayland-compositor-drm-egl-server-buffer.so",
171+
"./" + distDir + "/p/wayland-graphics-integration-server/libqt-wayland-compositor-linux-dmabuf-unstable-v1.so",
172+
"./" + distDir + "/p/wayland-graphics-integration-server/libqt-wayland-compositor-shm-emulation-server.so",
173+
"./" + distDir + "/p/wayland-graphics-integration-server/libqt-wayland-compositor-vulkan-server.so",
174+
"./" + distDir + "/p/wayland-graphics-integration-server/libqt-wayland-compositor-wayland-egl.so",
175+
"./" + distDir + "/p/wayland-graphics-integration-server/libqt-wayland-compositor-wayland-eglstream-controller.so",
176+
"./" + distDir + "/p/wayland-graphics-integration-server/libqt-wayland-compositor-xcomposite-egl.so",
177+
"./" + distDir + "/p/wayland-graphics-integration-server/libqt-wayland-compositor-xcomposite-glx.so"
178+
});
179+
180+
res -= utils.createTree({
181+
"./" + distDir + "/p/wayland-graphics-integration-server/libdmabuf-server.so",
182+
"./" + distDir + "/p/wayland-graphics-integration-server/libdrm-egl-server.so",
183+
"./" + distDir + "/p/wayland-graphics-integration-server/liblinux-dmabuf-unstable-v1.so",
184+
"./" + distDir + "/p/wayland-graphics-integration-server/libqt-plugin-wayland-egl.so",
185+
"./" + distDir + "/p/wayland-graphics-integration-server/libshm-emulation-server.so",
186+
"./" + distDir + "/p/wayland-graphics-integration-server/libvulkan-server.so",
187+
"./" + distDir + "/p/wayland-graphics-integration-server/libwayland-eglstream-controller.so",
188+
"./" + distDir + "/p/wayland-graphics-integration-server/libxcomposite-egl.so",
189+
"./" + distDir + "/p/wayland-graphics-integration-server/libxcomposite-glx.so"
190+
});
191+
#endif
192+
return res;
193+
}

‎UnitTests/modulesqt515.h‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
#ifndef MODULESQT515_H
2+
#define MODULESQT515_H
3+
4+
#include "modulesqt514.h"
5+
6+
class ModulesQt515 : public ModulesQt514
7+
{
8+
public:
9+
ModulesQt515();
10+
11+
// ModulesQt513 interface
12+
public:
13+
QSet<QString> onlyC(const QString &distDir = DISTRO_DIR) const override;
14+
QSet<QString> qtLibs(const QString &distDir = DISTRO_DIR) const override;
15+
QSet<QString> qmlLibs(const QString &distDir = DISTRO_DIR) const override;
16+
QSet<QString> qtWithoutTr(const QString &distDir = DISTRO_DIR) const override;
17+
QSet<QString> qtWebEngine(const QString &distDir = DISTRO_DIR) const override;
18+
QSet<QString> testDistroLibs(const QString &distDir = DISTRO_DIR) const override;
19+
QSet<QString> testOutLibs(const QString &distDir = DISTRO_DIR) const override;
20+
21+
};
22+
23+
#endif // MODULESQT515_H

0 commit comments

Comments
 (0)