feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Perforce: Fix testing settings

Browse Source 
Changed settings had been taken into account only after
an explicit Apply and this may be rather confusing.

Change-Id: I344ddf18a3cb15b0bc2d2b41a38587395b592e46
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Stenger
2023-05-10 13:03:33 +02:00
parent 985c1ee3e9
commit 9c2fa5c975
2 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/perforce/perforcesettings.cpp
View File

@@ -106,6 +106,23 @@ QStringList PerforceSettings::commonP4Arguments() const
return lst; return lst;
} }
QStringList PerforceSettings::commonP4Arguments_volatile() const
{
QStringList lst;
if (customEnv.volatileValue().toBool()) {
auto p4C = p4Client.volatileValue().toString();
if (!p4C.isEmpty())
lst << "-c" << p4C;
auto p4P = p4Port.volatileValue().toString();
if (!p4P.isEmpty())
lst << "-p" << p4P;
auto p4U = p4User.volatileValue().toString();
if (!p4U.isEmpty())
lst << "-u" << p4U;
}
return lst;
}
bool PerforceSettings::isValid() const bool PerforceSettings::isValid() const
{ {
return !m_topLevel.isEmpty() && !p4BinaryPath.value().isEmpty(); return !m_topLevel.isEmpty() && !p4BinaryPath.value().isEmpty();
@@ -234,7 +251,10 @@ PerforceSettingsPage::PerforceSettingsPage(PerforceSettings *settings)
errorLabel->setStyleSheet(QString()); errorLabel->setStyleSheet(QString());
errorLabel->setText(Tr::tr("Testing...")); errorLabel->setText(Tr::tr("Testing..."));
checker->start(settings->p4BinaryPath.filePath(), {}, settings->commonP4Arguments(), 10000);
const FilePath p4Bin = FilePath::fromUserInput(
settings->p4BinaryPath.volatileValue().toString());
checker->start(p4Bin, {}, settings->commonP4Arguments_volatile(), 10000);
}); });
Group config { Group config {

1
src/plugins/perforce/perforcesettings.h
View File

@@ -64,6 +64,7 @@ public:
// Return basic arguments, including -d and server connection parameters. // Return basic arguments, including -d and server connection parameters.
QStringList commonP4Arguments() const; QStringList commonP4Arguments() const;
QStringList commonP4Arguments(const QString &workingDir) const; QStringList commonP4Arguments(const QString &workingDir) const;
QStringList commonP4Arguments_volatile() const; // remove when auto apply is done
void clearTopLevel(); void clearTopLevel();