Skip to content

Commit 91d5c9d

Browse files
EndrIIEndrII
authored
Merge pull request #408 from QuasarApp/windows5.15
Added support qt 5.15 for windows
2 parents 9940e8c + f15dd73 commit 91d5c9d

File tree

3 files changed

+44
-7
lines changed

3 files changed

+44
-7
lines changed

‎Deploy/extracter.cpp‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,9 @@ void Extracter::copyExtraPlugins(const QString& package) {
149149
if (info.isDir()) {
150150
QStringList plugins;
151151
if (!_fileManager->copyFolder(info.absoluteFilePath(),
152-
targetPath + distro.getPluginsOutDir() + info.fileName()
153-
, {}, &plugins)) {
152+
targetPath + distro.getPluginsOutDir() + info.fileName(),
153+
QStringList() << ".so.debug" << "d.dll" << ".pdb" << ".dll.debug",
154+
&plugins)) {
154155

155156
QuasarAppUtils::Params::log("fail to copy extra plugin from:" + info.absoluteFilePath() +
156157
" to: " + targetPath + distro.getPluginsOutDir(),
@@ -179,7 +180,7 @@ void Extracter::extractPlugins() {
179180
_pluginsParser->scan(cnf->qtDir.getPlugins(), plugins, _packageDependencyes[i.key()].qtModules(), i.key());
180181

181182
_fileManager->copyFiles(plugins, targetPath + distro.getPluginsOutDir(), 1,
182-
QStringList() << ".so.debug" << "d.dll" << ".pdb", &listItems);
183+
QStringList() << ".so.debug" << "d.dll" << ".pdb" << ".dll.debug", &listItems);
183184

184185
for (const auto &item : listItems) {
185186
extractPluginLib(item, i.key());
@@ -380,7 +381,7 @@ bool Extracter::extractQmlAll() {
380381
QStringList listItems;
381382

382383
if (!_fileManager->copyFolder(cnf->qtDir.getQmls(), targetPath + distro.getQmlOutDir(),
383-
QStringList() << ".so.debug" << "d.dll" << ".pdb",
384+
QStringList() << ".so.debug" << "d.dll" << ".pdb" << ".dll.debug",
384385
&listItems)) {
385386
return false;
386387
}
@@ -405,7 +406,7 @@ bool Extracter::extractQmlFromSource() {
405406
QStringList plugins;
406407
QStringList listItems;
407408
QStringList filter;
408-
filter << ".so.debug" << "d.dll" << ".pdb";
409+
filter << ".so.debug" << "d.dll" << ".pdb" << ".dll.debug";
409410

410411
for (const auto &qmlInput: distro.qmlInput()) {
411412
QFileInfo info(qmlInput);

‎Deploy/qml.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,8 @@ bool QML::deployPath(const QString &path, QStringList &res) {
115115

116116
for (auto info : infoList) {
117117
if (info.fileName().contains(".so.debug") ||
118-
info.fileName().contains("d.dll")) {
118+
info.fileName().contains("d.dll") ||
119+
info.fileName().contains(".dll.debug")) {
119120
QuasarAppUtils::Params::log("sciped debug lib " +
120121
info.absoluteFilePath());
121122
continue;

‎UnitTests/modulesqt515.cpp‎

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,16 @@ QSet<QString> ModulesQt515::qmlLibs(const QString &distDir) const {
3535

3636
#ifdef Q_OS_WIN
3737
res += utils.createTree({
38-
38+
"./" + distDir + "/qml/QtQuick/Controls.2/Fusion/VerticalHeaderView.qml",
39+
"./" + distDir + "/qml/QtQuick/Controls.2/Fusion/HorizontalHeaderView.qml",
40+
"./" + distDir + "/qml/QtQuick/Controls.2/HorizontalHeaderView.qml",
41+
"./" + distDir + "/qml/QtQuick/Controls.2/Imagine/HorizontalHeaderView.qml",
42+
"./" + distDir + "/qml/QtQuick/Controls.2/Imagine/VerticalHeaderView.qml",
43+
"./" + distDir + "/qml/QtQuick/Controls.2/Material/HorizontalHeaderView.qml",
44+
"./" + distDir + "/qml/QtQuick/Controls.2/Material/VerticalHeaderView.qml",
45+
"./" + distDir + "/qml/QtQuick/Controls.2/Universal/HorizontalHeaderView.qml",
46+
"./" + distDir + "/qml/QtQuick/Controls.2/Universal/VerticalHeaderView.qml",
47+
"./" + distDir + "/qml/QtQuick/Controls.2/VerticalHeaderView.qml"
3948
});
4049
#else
4150
res -= utils.createTree({
@@ -110,6 +119,20 @@ QSet<QString> ModulesQt515::testDistroLibs(const QString &distDir) const {
110119
auto res = ModulesQt514::testDistroLibs(distDir);
111120

112121
#ifdef Q_OS_WIN
122+
123+
res += utils.createTree({
124+
"./" + distDir + "/package2/ZzZ/q/and/q/QtQuick/Controls.2/Fusion/VerticalHeaderView.qml",
125+
"./" + distDir + "/package2/ZzZ/q/and/q/QtQuick/Controls.2/Fusion/HorizontalHeaderView.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+
113136
#else
114137
res += utils.createTree({
115138
"./" + distDir + "/package2/ZzZ/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-dmabuf-server-buffer.so",
@@ -154,6 +177,18 @@ QSet<QString> ModulesQt515::testOutLibs(const QString &distDir) const {
154177
auto res = ModulesQt514::testOutLibs(distDir);
155178

156179
#ifdef Q_OS_WIN
180+
res += utils.createTree({
181+
"./" + distDir + "/q/QtQuick/Controls.2/Fusion/VerticalHeaderView.qml",
182+
"./" + distDir + "/q/QtQuick/Controls.2/Fusion/HorizontalHeaderView.qml",
183+
"./" + distDir + "/q/QtQuick/Controls.2/HorizontalHeaderView.qml",
184+
"./" + distDir + "/q/QtQuick/Controls.2/Imagine/HorizontalHeaderView.qml",
185+
"./" + distDir + "/q/QtQuick/Controls.2/Imagine/VerticalHeaderView.qml",
186+
"./" + distDir + "/q/QtQuick/Controls.2/Material/HorizontalHeaderView.qml",
187+
"./" + distDir + "/q/QtQuick/Controls.2/Material/VerticalHeaderView.qml",
188+
"./" + distDir + "/q/QtQuick/Controls.2/Universal/HorizontalHeaderView.qml",
189+
"./" + distDir + "/q/QtQuick/Controls.2/Universal/VerticalHeaderView.qml",
190+
"./" + distDir + "/q/QtQuick/Controls.2/VerticalHeaderView.qml"
191+
});
157192
#else
158193
res += utils.createTree({
159194
"./" + distDir + "/q/QtQuick/Controls.2/Fusion/HorizontalHeaderView.qml",

0 commit comments

Comments
 (0)