Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix of windows debug extensions #764

Merged
merged 9 commits into from
Jul 19, 2023
Merged

Fix of windows debug extensions #764

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e814a55
fix windows debug extansions
EndrII Jul 19, 2023
e2202e5
Update src/Deploy/src/deploycore.cpp
EndrII Jul 19, 2023
98be0d1
try fix windows tests
EndrII Jul 19, 2023
61f03f9
Merge branch 'task_763' of github.com:QuasarApp/CQtDeployer into task…
EndrII Jul 19, 2023
4838066
update windows tests cases
EndrII Jul 19, 2023
942b554
fix build
EndrII Jul 19, 2023
06fa1f5
fix windows tests
EndrII Jul 19, 2023
0a477c7
fix tests
EndrII Jul 19, 2023
faabadf
fix windows config
EndrII Jul 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/Deploy/src/deploycore.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" extansion too.
EndrII marked this conversation as resolved.
Show resolved Hide resolved
return {".debug", ".pdb"};
}

bool DeployCore::isDebugFile(const QString &file) {
Expand Down
10 changes: 5 additions & 5 deletions src/Deploy/src/distromodule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand All @@ -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;
}

Expand All @@ -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;
}

Expand Down Expand Up @@ -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;
}

Expand All @@ -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;
}

Expand Down
10 changes: 5 additions & 5 deletions src/Deploy/src/distromodule.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,15 @@ class DEPLOYSHARED_EXPORT DistroModule: public DistroStruct
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);

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

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);

Expand Down