QuasarApp/CQtDeployer
4
1
Fork 0
mirror of https://github.com/QuasarApp/CQtDeployer.git synced 2025-04-27 02:04:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #764 from QuasarApp/task_763
All checks were successful
buildbot/DocsGenerator Build finished.
Details
buildbot/AndroidBuilder_v8Qt6 Build finished.
Details
buildbot/IOSCMakeBuilder Build finished.
Details
buildbot/WindowsCMakeBuilder Build finished.
Details
buildbot/LinuxCMakeBuilderQt6 Build finished.
Details

Browse Source 
Fix of windows debug extensions
This commit is contained in:
Andrei Yankovich 2023-07-20 02:33:15 +03:00 committed by GitHub
commit 76d1d20859
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 72 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Deploy/src/deploycore.cpp
View File

@ -677,7 +677,8 @@ QString DeployCore::findProcess(const QString &env, const QString& proc, bool ig
}
QStringList DeployCore::debugExtensions() {
return {".debug", "d.dll", ".pdb"};
// from 6.5 windows version of Qt use a "gebug" extension too.
return {".debug", ".pdb"};
}
bool DeployCore::isDebugFile(const QString &file) {
@ -742,6 +743,9 @@ MSVCVersion DeployCore::getMSVC(const QString &_qtBin) {
else if (version == "2019") {
res |= MSVC_19;
}
else if (version == "2022") {
res |= MSVC_22;
}
if (type == "32") {
res |= MSVC_x32;
@ -756,6 +760,10 @@ MSVCVersion DeployCore::getMSVC(const QString &_qtBin) {
QString DeployCore::getVCredist(const QString &_qtbinDir) {
auto msvc = getMSVC(_qtbinDir);
if (msvc == MSVCVersion::MSVC_Unknown) {
return "";
}
QDir dir = _qtbinDir;
if (!(dir.cdUp() && dir.cdUp() && dir.cdUp() && dir.cd("vcredist"))) {
@ -789,6 +797,8 @@ QString DeployCore::getMSVCName(MSVCVersion msvc) {
return "msvc2017";
} else if (msvc & MSVCVersion::MSVC_19) {
return "msvc2019";
} else if (msvc & MSVCVersion::MSVC_22) {
return "msvc2022";
}
return "";

15
src/Deploy/src/deploycore.h
View File

@ -15,13 +15,14 @@
#include <params.h>
enum MSVCVersion: int {
MSVC_Unknown = 0x0,
MSVC_x64 = 0x01,
MSVC_x32 = 0x02,
MSVC_13 = 0x10,
MSVC_15 = 0x20,
MSVC_17 = 0x40,
MSVC_19 = 0x80,
MSVC_Unknown = 0x0000,
MSVC_x64 = 0x0001,
MSVC_x32 = 0x0002,
MSVC_13 = 0x0010,
MSVC_15 = 0x0020,
MSVC_17 = 0x0040,
MSVC_19 = 0x0080,
MSVC_22 = 0x0100,
};
/**

10
src/Deploy/src/distromodule.cpp
View File

@ -77,7 +77,7 @@ void DistroModule::setPublisher(const QString &publisher) {
_publisher = publisher;
}
QSet<QString> DistroModule::enabledPlugins() const {
const QSet<QString>& DistroModule::enabledPlugins() const {
return _enabled;
}
@ -89,7 +89,7 @@ void DistroModule::addEnabledPlugins(const QString &enabled) {
_enabled += enabled;
}
QSet<QString> DistroModule::disabledPlugins() const {
const QSet<QString>& DistroModule::disabledPlugins() const {
return _disabled;
}
@ -101,7 +101,7 @@ void DistroModule::addDisabledPlugins(const QString &disabled) {
_disabled += disabled;
}
QSet<QString> DistroModule::extraPlugins() const {
const QSet<QString> &DistroModule::extraPlugins() const {
return _extraPlugins;
}
@ -175,7 +175,7 @@ void DistroModule::setInstallDirDEB(const QString &newInstallDir) {
_installDirDEB = newInstallDir;
}
QSet<QString> DistroModule::translation() const {
const QSet<QString> &DistroModule::translation() const {
return _tr;
}
@ -187,7 +187,7 @@ void DistroModule::addTranslation(const QString &tr) {
_tr += tr;
}
QSet<QString> DistroModule::extraData() const {
const QSet<QString> &DistroModule::extraData() const {
return _extraData;
}

10
src/Deploy/src/distromodule.h
View File

@ -42,15 +42,15 @@ public:
QString publisher() const;
void setPublisher(const QString &publisher);
QSet<QString> enabledPlugins() const;
const QSet<QString> &enabledPlugins() const;
void setEnabledPlugins(const QSet<QString> &enabled);
void addEnabledPlugins(const QString &enabled);
QSet<QString> disabledPlugins() const;
const QSet<QString> &disabledPlugins() const;
void setDisabledPlugins(const QSet<QString> &disabled);
void addDisabledPlugins(const QString &disabled);
QSet<QString> extraPlugins() const;
const QSet<QString>& extraPlugins() const;
void setExtraPlugins(const QSet<QString> &extraPlugins);
void addExtraPlugins(const QString &extraPlugin);
@ -66,11 +66,11 @@ public:
bool isValid();
QSet<QString> extraData() const;
const QSet<QString>& extraData() const;
void setExtraData(const QSet<QString> &extraFiles);
void addExtraData(const QString &extraFile);
QSet<QString> translation() const;
const QSet<QString>& translation() const;
void setTranslation(const QSet<QString> &tr);
void addTranslation(const QString &tr);

3
tests/modules/modulesqt6_3.cpp
View File

@ -404,6 +404,9 @@ QSet<QString> ModulesQt63::qmlLibs(const QString &distDir) const {
"./" + distDir + "/qml/QtQuick/plugins.qmltypes",
"./" + distDir + "/qml/QtQuick/qmldir",
"./" + distDir + "/qml/QtQuick/qtquick2plugin.dll",
"./" + distDir + "/plugins/tls/qcertonlybackend.dll",
"./" + distDir + "/plugins/tls/qopensslbackend.dll",
"./" + distDir + "/plugins/tls/qschannelbackend.dll",
"./" + distDir + "/translations/qtdeclarative_ar.qm",
"./" + distDir + "/translations/qtdeclarative_bg.qm",
"./" + distDir + "/translations/qtdeclarative_ca.qm",

42
tests/modules/modulesqt6_5.cpp
View File

@ -18,20 +18,35 @@ QSet<QString> ModulesQt6_5::qmlLibs(const QString &distDir) const {
Tree -= utils.createTree(
{
"./" + distDir + "/qml/QtQml/qmlplugin.dll",
"./" + distDir + "/qml/QtQml/libqmlplugin.so",
"./" + distDir + "/qml/QtQml/plugins.qmltypes"
}
);
#ifdef Q_OS_WIN
Tree += utils.createTree(
{
"./" + distDir + "/qml/QtQml/Base/libqmlplugin.so",
"./" + distDir + "/qml/QtQml/Base/plugins.qmltypes",
"./" + distDir + "/qml/QtQml/Base/qmldir",
"./" + distDir + "/qml/QtQml/libqmlmetaplugin.so",
"./" + distDir + "/qml/QtQuick/Controls/Material/impl/RoundedElevationEffect.qml"
"./" + distDir + "/qml/QtQml/Base/qmlplugin.dll",
"./" + distDir + "/qml/QtQml/Base/plugins.qmltypes",
"./" + distDir + "/qml/QtQml/Base/qmldir",
"./" + distDir + "/qml/QtQml/qmlmetaplugin.dll",
"./" + distDir + "/qml/QtQuick/Controls/Material/impl/RoundedElevationEffect.qml",
"./" + distDir + "/qml/QtQuick/Controls/Windows/ApplicationWindow.qml"
}
);
);
#else
Tree += utils.createTree(
{
"./" + distDir + "/qml/QtQml/Base/libqmlplugin.so",
"./" + distDir + "/qml/QtQml/Base/plugins.qmltypes",
"./" + distDir + "/qml/QtQml/Base/qmldir",
"./" + distDir + "/qml/QtQml/libqmlmetaplugin.so",
"./" + distDir + "/qml/QtQuick/Controls/Material/impl/RoundedElevationEffect.qml"
}
);
#endif
return Tree;
}
@ -52,6 +67,21 @@ QSet<QString> ModulesQt6_5::qtWebEngine(const QString &distDir) const
return Tree;
}
QSet<QString> ModulesQt6_5::qtLibs(const QString &distDir) const {
auto Tree = ModulesQt6_4::qtLibs(distDir);
TestUtils utils;
#ifdef Q_OS_WIN
Tree += utils.createTree(
{
"./" + distDir + "/plugins/platforms/qdirect2d.dll",
}
);
#endif
return Tree;
}
QSet<QString> ModulesQt6_5::qtWebEngineWidgets(const QString &distDir) const
{
TestUtils utils;

3
tests/modules/modulesqt6_5.h
View File

@ -18,8 +18,7 @@ public:
QSet<QString> qmlVirtualKeyBoadrLibs(const QString &distDir = DISTRO_DIR) const override;
QSet<QString> qtWebEngine(const QString &distDir = DISTRO_DIR) const override;
QSet<QString> qtWebEngineWidgets(const QString &distDir = DISTRO_DIR) const override;
QSet<QString> qtLibs(const QString &distDir = DISTRO_DIR) const override;
};
#endif // MODULESQT6_5_H

4
tests/tstMain.cpp
View File

@ -275,7 +275,9 @@ tstMain::tstMain() {
cqtTestPath = cqtTestPath +
DeployCore::getEnvSeparator() +
QT_BASE_DIR + "/../../Tools/QtInstallerFramework/4.5/bin/";
cqtTestPath = cqtTestPath +
DeployCore::getEnvSeparator() +
QT_BASE_DIR + "/../../Tools/QtInstallerFramework/4.6/bin/";
qputenv("PATH", cqtTestPath.toLatin1().data());
TestUtils utils;