birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'development' into cmake/SPEC-7484

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

# Conflicts:
#	Code/Editor/Animation/SkeletonHierarchy.cpp
#	Code/Editor/Animation/SkeletonMapper.cpp
#	Code/Editor/Animation/SkeletonMapperOperator.cpp
#	Code/Editor/LogFile.cpp
#	Code/Editor/ResourceSelectorHost.cpp
#	Code/Editor/SettingsManager.cpp
#	Code/Editor/Util/EditorUtils.cpp
#	Code/Editor/Util/FileUtil.cpp
#	Code/Editor/Util/IXmlHistoryManager.h
#	Code/Editor/Util/ImageTIF.cpp
#	Code/Editor/Util/StringHelpers.cpp
#	Code/Editor/Util/XmlHistoryManager.cpp
#	Code/Editor/Util/XmlHistoryManager.h
This commit is contained in:
Esteban Papp
2021-08-06 10:08:37 -07:00
parent 03cf71b12d 9e0b8c564d
commit 6db7488939
252 changed files with 2886 additions and 1079 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Editor/ToolsConfigPage.cpp
+3 -3
View File
@@ -109,7 +109,7 @@ private:
QStringList m_iconFiles;
};
CIconListDialog::CIconListDialog(QWidget* pParent /* = NULL */)
CIconListDialog::CIconListDialog(QWidget* pParent /* = nullptr */)
: QDialog(pParent)
, m_ui(new Ui::IconListDialog)
{
@@ -498,7 +498,7 @@ CToolsConfigPage::CToolsConfigPage(QWidget* parent)
QKeySequence shortcut(value);
m_ui->m_macroShortcutKey->setKeySequence(shortcut);
}
if (m_ui->m_macroShortcutKey->keySequence().count() >= 1)
{
m_ui->m_assignShortcut->setEnabled(true);
@@ -703,7 +703,7 @@ void CToolsConfigPage::OnAssignMacroShortcut()
{
auto pShortcutMgr = MainWindow::instance()->GetShortcutManager();
if (pShortcutMgr == NULL)
if (pShortcutMgr == nullptr)
{
return;
}