diff --git a/src/Deploy/src/deploycore.cpp b/src/Deploy/src/deploycore.cpp index 425f0e4..543cfd0 100644 --- a/src/Deploy/src/deploycore.cpp +++ b/src/Deploy/src/deploycore.cpp @@ -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. + return {".debug", ".pdb"}; } bool DeployCore::isDebugFile(const QString &file) { diff --git a/src/Deploy/src/distromodule.cpp b/src/Deploy/src/distromodule.cpp index cf1063b..aaff833 100644 --- a/src/Deploy/src/distromodule.cpp +++ b/src/Deploy/src/distromodule.cpp @@ -77,7 +77,7 @@ void DistroModule::setPublisher(const QString &publisher) { _publisher = publisher; } -QSet DistroModule::enabledPlugins() const { +const QSet& DistroModule::enabledPlugins() const { return _enabled; } @@ -89,7 +89,7 @@ void DistroModule::addEnabledPlugins(const QString &enabled) { _enabled += enabled; } -QSet DistroModule::disabledPlugins() const { +const QSet& DistroModule::disabledPlugins() const { return _disabled; } @@ -101,7 +101,7 @@ void DistroModule::addDisabledPlugins(const QString &disabled) { _disabled += disabled; } -QSet DistroModule::extraPlugins() const { +const QSet &DistroModule::extraPlugins() const { return _extraPlugins; } @@ -175,7 +175,7 @@ void DistroModule::setInstallDirDEB(const QString &newInstallDir) { _installDirDEB = newInstallDir; } -QSet DistroModule::translation() const { +const QSet &DistroModule::translation() const { return _tr; } @@ -187,7 +187,7 @@ void DistroModule::addTranslation(const QString &tr) { _tr += tr; } -QSet DistroModule::extraData() const { +const QSet &DistroModule::extraData() const { return _extraData; } diff --git a/src/Deploy/src/distromodule.h b/src/Deploy/src/distromodule.h index 0b8e77c..4d68d8b 100644 --- a/src/Deploy/src/distromodule.h +++ b/src/Deploy/src/distromodule.h @@ -42,15 +42,15 @@ public: QString publisher() const; void setPublisher(const QString &publisher); - QSet enabledPlugins() const; + const QSet &enabledPlugins() const; void setEnabledPlugins(const QSet &enabled); void addEnabledPlugins(const QString &enabled); - QSet disabledPlugins() const; + const QSet &disabledPlugins() const; void setDisabledPlugins(const QSet &disabled); void addDisabledPlugins(const QString &disabled); - QSet extraPlugins() const; + const QSet& extraPlugins() const; void setExtraPlugins(const QSet &extraPlugins); void addExtraPlugins(const QString &extraPlugin); @@ -66,11 +66,11 @@ public: bool isValid(); - QSet extraData() const; + const QSet& extraData() const; void setExtraData(const QSet &extraFiles); void addExtraData(const QString &extraFile); - QSet translation() const; + const QSet& translation() const; void setTranslation(const QSet &tr); void addTranslation(const QString &tr);