Commit 74ae95e7 authored by Laurent Montel's avatar Laurent Montel 😁

Merge remote-tracking branch 'origin/release/20.12'

parents 1ac70497 2e1f80b8
Pipeline #42686 failed with stage
in 15 minutes and 36 seconds
......@@ -129,7 +129,9 @@ void GoogleSettingsDialog::accountChanged()
void GoogleSettingsDialog::slotConfigure()
{
const QString username = m_account && m_account->accountName().isEmpty() ? QString() : m_account->accountName();
const QString username = m_account && !m_account->accountName().isEmpty()
? m_account->accountName()
: QString();
m_account = AccountPtr(new Account());
const QList<QUrl> resourceScopes = m_resource->scopes();
for (const QUrl &scope : resourceScopes) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment