From 11d36b0b5bbfed4a61352f9e29edcab5e0bf1ed7 Mon Sep 17 00:00:00 2001
From: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
Date: Wed, 7 Jul 2021 12:49:34 -0700
Subject: [PATCH 1/2] [mobile-settings-fixes] simplified and updated version
 validation regex to support 4 component strings

Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
---
 Code/Editor/Plugins/ProjectSettingsTool/Validators.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Code/Editor/Plugins/ProjectSettingsTool/Validators.cpp b/Code/Editor/Plugins/ProjectSettingsTool/Validators.cpp
index 8484a2937a..c17da8e40b 100644
--- a/Code/Editor/Plugins/ProjectSettingsTool/Validators.cpp
+++ b/Code/Editor/Plugins/ProjectSettingsTool/Validators.cpp
@@ -172,8 +172,9 @@ namespace ProjectSettingsTool
         // Returns true if valid ios version number
         RetType IOSVersionNumber(const QString& value)
         {
+            // support up to 4-component numerical-only version strings
             return RegularExpressionValidator
-                       ("(0|[1-9][0-9]{0,8}|[1-2][0-1][0-9]{0,8})(\\.(0|[1-9][0-9]{0,8}|[1-2][0-1][0-9]{0,8})){0,2}",
+                       ("^(\\d+)(\\.\\d+){0,3}$",
                        value,
                        maxIosVersionLength);
         }

From 34f70cb3243c0a6c0f63e1ef702c5252a0a62b48 Mon Sep 17 00:00:00 2001
From: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
Date: Wed, 7 Jul 2021 13:17:00 -0700
Subject: [PATCH 2/2] [mobile-settings-fixes] removed stale WAF reconfigure
 process on settings save

Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
---
 .../ProjectSettingsToolWindow.cpp             | 28 +++----------------
 1 file changed, 4 insertions(+), 24 deletions(-)

diff --git a/Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsToolWindow.cpp b/Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsToolWindow.cpp
index f1a2aafd1e..f4e4fed973 100644
--- a/Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsToolWindow.cpp
+++ b/Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsToolWindow.cpp
@@ -585,31 +585,11 @@ namespace ProjectSettingsTool
                     ShowAllErrorsThenExitIfInvalid();
 
                     m_ui->reconfigureLog->setText("");
-                    int result = QMessageBox::question
-                        (
-                        this,
-                        tr("Reconfigure Project"),
-                        tr("For new settings to be applied the project must be reconfigured. Would you like run configure now?"),
-                        QMessageBox::Yes,
-                        QMessageBox::No
-                        );
+                    QMessageBox::information(this, tr("Project Settings Saved"),
+                        tr("The project may need to be manually reconfigured for the new settings to be applied."));
 
-                    if (QMessageBox::Yes == result)
-                    {
-                        m_ui->reconfigureLog->show();
-                    #if defined(AZ_PLATFORM_WINDOWS)
-                        m_reconfigureProcess.start("cmd.exe", { QString("/C %1").arg("lmbr_waf.bat configure") });
-                    #elif defined(AZ_PLATFORM_MAC) || defined(AZ_PLATFORM_LINUX)
-                        m_reconfigureProcess.start("/bin/sh", { QString("%1").arg("lmbr_waf.sh configure") });
-                    #else
-                        #error "Needs to be implemented"
-                    #endif
-                    }
-                    else
-                    {
-                        m_ui->reloadButton->setEnabled(true);
-                        m_ui->saveButton->setEnabled(true);
-                    }
+                    m_ui->reloadButton->setEnabled(true);
+                    m_ui->saveButton->setEnabled(true);
                 }
                 // Show a message box telling user settings failed to save
                 else