Skip to content

Commit 76d1d20

Browse files
EndrIIEndrII
authored
Merge pull request #764 from QuasarApp/task_763
Fix of windows debug extensions
2 parents ce62467 + faabadf commit 76d1d20

File tree

8 files changed

+72
-27
lines changed

8 files changed

+72
-27
lines changed

‎src/Deploy/src/deploycore.cpp‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -677,7 +677,8 @@ QString DeployCore::findProcess(const QString &env, const QString& proc, bool ig
677677
}
678678

679679
QStringList DeployCore::debugExtensions() {
680-
return {".debug", "d.dll", ".pdb"};
680+
// from 6.5 windows version of Qt use a "gebug" extension too.
681+
return {".debug", ".pdb"};
681682
}
682683

683684
bool DeployCore::isDebugFile(const QString &file) {
@@ -742,6 +743,9 @@ MSVCVersion DeployCore::getMSVC(const QString &_qtBin) {
742743
else if (version == "2019") {
743744
res |= MSVC_19;
744745
}
746+
else if (version == "2022") {
747+
res |= MSVC_22;
748+
}
745749

746750
if (type == "32") {
747751
res |= MSVC_x32;
@@ -756,6 +760,10 @@ MSVCVersion DeployCore::getMSVC(const QString &_qtBin) {
756760
QString DeployCore::getVCredist(const QString &_qtbinDir) {
757761
auto msvc = getMSVC(_qtbinDir);
758762

763+
if (msvc == MSVCVersion::MSVC_Unknown) {
764+
return "";
765+
}
766+
759767
QDir dir = _qtbinDir;
760768

761769
if (!(dir.cdUp() && dir.cdUp() && dir.cdUp() && dir.cd("vcredist"))) {
@@ -789,6 +797,8 @@ QString DeployCore::getMSVCName(MSVCVersion msvc) {
789797
return "msvc2017";
790798
} else if (msvc & MSVCVersion::MSVC_19) {
791799
return "msvc2019";
800+
} else if (msvc & MSVCVersion::MSVC_22) {
801+
return "msvc2022";
792802
}
793803

794804
return "";

‎src/Deploy/src/deploycore.h‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,14 @@
1515
#include <params.h>
1616

1717
enum MSVCVersion: int {
18-
MSVC_Unknown = 0x0,
19-
MSVC_x64 = 0x01,
20-
MSVC_x32 = 0x02,
21-
MSVC_13 = 0x10,
22-
MSVC_15 = 0x20,
23-
MSVC_17 = 0x40,
24-
MSVC_19 = 0x80,
18+
MSVC_Unknown = 0x0000,
19+
MSVC_x64 = 0x0001,
20+
MSVC_x32 = 0x0002,
21+
MSVC_13 = 0x0010,
22+
MSVC_15 = 0x0020,
23+
MSVC_17 = 0x0040,
24+
MSVC_19 = 0x0080,
25+
MSVC_22 = 0x0100,
2526
};
2627

2728
/**

‎src/Deploy/src/distromodule.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ void DistroModule::setPublisher(const QString &publisher) {
7777
_publisher = publisher;
7878
}
7979

80-
QSet<QString> DistroModule::enabledPlugins() const {
80+
const QSet<QString>& DistroModule::enabledPlugins() const {
8181
return _enabled;
8282
}
8383

@@ -89,7 +89,7 @@ void DistroModule::addEnabledPlugins(const QString &enabled) {
8989
_enabled += enabled;
9090
}
9191

92-
QSet<QString> DistroModule::disabledPlugins() const {
92+
const QSet<QString>& DistroModule::disabledPlugins() const {
9393
return _disabled;
9494
}
9595

@@ -101,7 +101,7 @@ void DistroModule::addDisabledPlugins(const QString &disabled) {
101101
_disabled += disabled;
102102
}
103103

104-
QSet<QString> DistroModule::extraPlugins() const {
104+
const QSet<QString> &DistroModule::extraPlugins() const {
105105
return _extraPlugins;
106106
}
107107

@@ -175,7 +175,7 @@ void DistroModule::setInstallDirDEB(const QString &newInstallDir) {
175175
_installDirDEB = newInstallDir;
176176
}
177177

178-
QSet<QString> DistroModule::translation() const {
178+
const QSet<QString> &DistroModule::translation() const {
179179
return _tr;
180180
}
181181

@@ -187,7 +187,7 @@ void DistroModule::addTranslation(const QString &tr) {
187187
_tr += tr;
188188
}
189189

190-
QSet<QString> DistroModule::extraData() const {
190+
const QSet<QString> &DistroModule::extraData() const {
191191
return _extraData;
192192
}
193193

‎src/Deploy/src/distromodule.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,15 @@ class DEPLOYSHARED_EXPORT DistroModule: public DistroStruct
4242
QString publisher() const;
4343
void setPublisher(const QString &publisher);
4444

45-
QSet<QString> enabledPlugins() const;
45+
const QSet<QString> &enabledPlugins() const;
4646
void setEnabledPlugins(const QSet<QString> &enabled);
4747
void addEnabledPlugins(const QString &enabled);
4848

49-
QSet<QString> disabledPlugins() const;
49+
const QSet<QString> &disabledPlugins() const;
5050
void setDisabledPlugins(const QSet<QString> &disabled);
5151
void addDisabledPlugins(const QString &disabled);
5252

53-
QSet<QString> extraPlugins() const;
53+
const QSet<QString>& extraPlugins() const;
5454
void setExtraPlugins(const QSet<QString> &extraPlugins);
5555
void addExtraPlugins(const QString &extraPlugin);
5656

@@ -66,11 +66,11 @@ class DEPLOYSHARED_EXPORT DistroModule: public DistroStruct
6666

6767
bool isValid();
6868

69-
QSet<QString> extraData() const;
69+
const QSet<QString>& extraData() const;
7070
void setExtraData(const QSet<QString> &extraFiles);
7171
void addExtraData(const QString &extraFile);
7272

73-
QSet<QString> translation() const;
73+
const QSet<QString>& translation() const;
7474
void setTranslation(const QSet<QString> &tr);
7575
void addTranslation(const QString &tr);
7676

‎tests/modules/modulesqt6_3.cpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -404,6 +404,9 @@ QSet<QString> ModulesQt63::qmlLibs(const QString &distDir) const {
404404
"./" + distDir + "/qml/QtQuick/plugins.qmltypes",
405405
"./" + distDir + "/qml/QtQuick/qmldir",
406406
"./" + distDir + "/qml/QtQuick/qtquick2plugin.dll",
407+
"./" + distDir + "/plugins/tls/qcertonlybackend.dll",
408+
"./" + distDir + "/plugins/tls/qopensslbackend.dll",
409+
"./" + distDir + "/plugins/tls/qschannelbackend.dll",
407410
"./" + distDir + "/translations/qtdeclarative_ar.qm",
408411
"./" + distDir + "/translations/qtdeclarative_bg.qm",
409412
"./" + distDir + "/translations/qtdeclarative_ca.qm",

‎tests/modules/modulesqt6_5.cpp‎

Lines changed: 36 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,35 @@ QSet<QString> ModulesQt6_5::qmlLibs(const QString &distDir) const {
1818

1919
Tree -= utils.createTree(
2020
{
21+
"./" + distDir + "/qml/QtQml/qmlplugin.dll",
2122
"./" + distDir + "/qml/QtQml/libqmlplugin.so",
2223
"./" + distDir + "/qml/QtQml/plugins.qmltypes"
2324
}
2425
);
2526

27+
#ifdef Q_OS_WIN
2628
Tree += utils.createTree(
2729
{
28-
"./" + distDir + "/qml/QtQml/Base/libqmlplugin.so",
29-
"./" + distDir + "/qml/QtQml/Base/plugins.qmltypes",
30-
"./" + distDir + "/qml/QtQml/Base/qmldir",
31-
"./" + distDir + "/qml/QtQml/libqmlmetaplugin.so",
32-
"./" + distDir + "/qml/QtQuick/Controls/Material/impl/RoundedElevationEffect.qml"
30+
"./" + distDir + "/qml/QtQml/Base/qmlplugin.dll",
31+
"./" + distDir + "/qml/QtQml/Base/plugins.qmltypes",
32+
"./" + distDir + "/qml/QtQml/Base/qmldir",
33+
"./" + distDir + "/qml/QtQml/qmlmetaplugin.dll",
34+
"./" + distDir + "/qml/QtQuick/Controls/Material/impl/RoundedElevationEffect.qml",
35+
"./" + distDir + "/qml/QtQuick/Controls/Windows/ApplicationWindow.qml"
36+
3337
}
34-
);
38+
);
39+
#else
40+
Tree += utils.createTree(
41+
{
42+
"./" + distDir + "/qml/QtQml/Base/libqmlplugin.so",
43+
"./" + distDir + "/qml/QtQml/Base/plugins.qmltypes",
44+
"./" + distDir + "/qml/QtQml/Base/qmldir",
45+
"./" + distDir + "/qml/QtQml/libqmlmetaplugin.so",
46+
"./" + distDir + "/qml/QtQuick/Controls/Material/impl/RoundedElevationEffect.qml"
47+
}
48+
);
49+
#endif
3550

3651
return Tree;
3752
}
@@ -52,6 +67,21 @@ QSet<QString> ModulesQt6_5::qtWebEngine(const QString &distDir) const
5267
return Tree;
5368
}
5469

70+
QSet<QString> ModulesQt6_5::qtLibs(const QString &distDir) const {
71+
auto Tree = ModulesQt6_4::qtLibs(distDir);
72+
TestUtils utils;
73+
74+
#ifdef Q_OS_WIN
75+
Tree += utils.createTree(
76+
{
77+
"./" + distDir + "/plugins/platforms/qdirect2d.dll",
78+
}
79+
);
80+
#endif
81+
82+
return Tree;
83+
}
84+
5585
QSet<QString> ModulesQt6_5::qtWebEngineWidgets(const QString &distDir) const
5686
{
5787
TestUtils utils;

‎tests/modules/modulesqt6_5.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ class ModulesQt6_5: public ModulesQt6_4
1818
QSet<QString> qmlVirtualKeyBoadrLibs(const QString &distDir = DISTRO_DIR) const override;
1919
QSet<QString> qtWebEngine(const QString &distDir = DISTRO_DIR) const override;
2020
QSet<QString> qtWebEngineWidgets(const QString &distDir = DISTRO_DIR) const override;
21-
22-
21+
QSet<QString> qtLibs(const QString &distDir = DISTRO_DIR) const override;
2322
};
2423

2524
#endif // MODULESQT6_5_H

‎tests/tstMain.cpp‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,9 @@ tstMain::tstMain() {
275275
cqtTestPath = cqtTestPath +
276276
DeployCore::getEnvSeparator() +
277277
QT_BASE_DIR + "/../../Tools/QtInstallerFramework/4.5/bin/";
278-
278+
cqtTestPath = cqtTestPath +
279+
DeployCore::getEnvSeparator() +
280+
QT_BASE_DIR + "/../../Tools/QtInstallerFramework/4.6/bin/";
279281
qputenv("PATH", cqtTestPath.toLatin1().data());
280282
TestUtils utils;
281283

0 commit comments

Comments
 (0)