Integrating latest 47acbe8

This commit is contained in:
alexpete
2021-03-25 13:57:57 -07:00
parent 448c549698
commit 75dc720198
10312 changed files with 2711566 additions and 671451 deletions
@@ -20,7 +20,11 @@
#include <QStandardItem>
#endif
#if !defined(DEFINED_QMETATYPE_UUID)
#define DEFINED_QMETATYPE_UUID
Q_DECLARE_METATYPE(AZ::Uuid);
#endif
namespace Ui
{
@@ -111,4 +115,4 @@ namespace AzQtComponents
private:
SearchTypeSelector* m_selector = nullptr;
};
}
}