Merge branch 'development' into cmake/SPEC-2513_w4244

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/CryEditDoc.cpp
#	Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputManager.cpp
#	Gems/Atom/Feature/Common/Code/Source/PostProcessing/BlendColorGradingLutsPass.cpp
#	Gems/PhysXDebug/Code/Source/SystemComponent.cpp
This commit is contained in:
Esteban Papp
2021-08-19 08:53:41 -07:00
370 changed files with 3276 additions and 4248 deletions
@@ -10,6 +10,7 @@
#include <QPushButton>
#include <QHBoxLayout>
#include <QKeyEvent>
namespace O3DE::ProjectManager
{
@@ -27,4 +28,14 @@ namespace O3DE::ProjectManager
: FormBrowseEditWidget(labelText, "", parent)
{
}
void FormBrowseEditWidget::keyPressEvent(QKeyEvent* event)
{
int key = event->key();
if (key == Qt::Key_Return || key == Qt::Key_Enter)
{
HandleBrowseButton();
}
}
} // namespace O3DE::ProjectManager
@@ -24,6 +24,9 @@ namespace O3DE::ProjectManager
explicit FormBrowseEditWidget(const QString& labelText = "", QWidget* parent = nullptr);
~FormBrowseEditWidget() = default;
protected:
void keyPressEvent(QKeyEvent* event) override;
protected slots:
virtual void HandleBrowseButton() = 0;
};
@@ -34,7 +34,6 @@ namespace O3DE::ProjectManager
{
setText(directory);
}
}
void FormFolderBrowseEditWidget::setText(const QString& text)
@@ -42,4 +41,5 @@ namespace O3DE::ProjectManager
QString path = QDir::toNativeSeparators(text);
FormBrowseEditWidget::setText(path);
}
} // namespace O3DE::ProjectManager