Squish: Handle changing configured Squish path

Update shared folders if the path to Squish has changed.

Change-Id: Iea861d1f51dd4170bc4b481176fa1a8019c24d3d
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Stenger
2022-10-12 15:08:03 +02:00
parent 39441654d8
commit 8a9072b8c2
3 changed files with 11 additions and 0 deletions

View File

@@ -108,6 +108,7 @@ void SquishPluginPrivate::initializeMenuEntries()
bool SquishPluginPrivate::initializeGlobalScripts() bool SquishPluginPrivate::initializeGlobalScripts()
{ {
QTC_ASSERT(dd->m_squishTools, return false); QTC_ASSERT(dd->m_squishTools, return false);
SquishFileHandler::instance()->setSharedFolders({});
const Utils::FilePath squishserver = dd->m_squishSettings.squishPath.filePath().pathAppended( const Utils::FilePath squishserver = dd->m_squishSettings.squishPath.filePath().pathAppended(
Utils::HostOsInfo::withExecutableSuffix("bin/squishserver")); Utils::HostOsInfo::withExecutableSuffix("bin/squishserver"));
@@ -135,6 +136,10 @@ bool SquishPlugin::initialize(const QStringList &, QString *)
bool SquishPlugin::delayedInitialize() bool SquishPlugin::delayedInitialize()
{ {
connect(&dd->m_squishSettings, &SquishSettings::squishPathChanged,
dd, &SquishPluginPrivate::initializeGlobalScripts);
return dd->initializeGlobalScripts(); return dd->initializeGlobalScripts();
} }

View File

@@ -84,6 +84,8 @@ SquishSettings::SquishSettings()
serverHost.setEnabled(!checked); serverHost.setEnabled(!checked);
serverPort.setEnabled(!checked); serverPort.setEnabled(!checked);
}); });
connect(&squishPath, &Utils::StringAspect::valueChanged,
this, &SquishSettings::squishPathChanged);
} }
Utils::FilePath SquishSettings::scriptsPath(Language language) const Utils::FilePath SquishSettings::scriptsPath(Language language) const

View File

@@ -38,6 +38,7 @@ public:
class SquishSettings : public Utils::AspectContainer class SquishSettings : public Utils::AspectContainer
{ {
Q_OBJECT
public: public:
SquishSettings(); SquishSettings();
@@ -50,6 +51,9 @@ public:
Utils::BoolAspect local; Utils::BoolAspect local;
Utils::BoolAspect verbose; Utils::BoolAspect verbose;
Utils::BoolAspect minimizeIDE; Utils::BoolAspect minimizeIDE;
signals:
void squishPathChanged();
}; };
class SquishSettingsPage final : public Core::IOptionsPage class SquishSettingsPage final : public Core::IOptionsPage