Integrating github/staging through commit ab87ed9

2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
@@ -102,7 +102,6 @@ namespace PerforceConnection
        // which CHARSET do we pick?  we prefer (servername) charset, but will fall back to just P4CHARSET
        for (const auto& value : m_retrievedSettings)
        {
-            QLineEdit *targetControl = nullptr;
            const AZStd::string& settingName = value.first;
            const SourceControlSettingInfo& info = value.second;
            ApplyValueToControl(GetControlForSetting(settingName), info);