Integrating github/staging through commit 5f214be
This commit is contained in:
@@ -16,7 +16,7 @@
|
||||
|
||||
#include "NewLogTabDialog.h"
|
||||
AZ_PUSH_DISABLE_WARNING(4251, "-Wunknown-warning-option") // 4251: 'QLayoutItem::align': class 'QFlags<Qt::AlignmentFlag>' needs to have dll-interface to be used by clients of class 'QLayoutItem'
|
||||
#include <UI/Logging/ui_NewLogTabDialog.h>
|
||||
#include <AzToolsFramework/UI/Logging/ui_NewLogTabDialog.h>
|
||||
AZ_POP_DISABLE_WARNING
|
||||
#include <QPushButton>
|
||||
#include <QLineEdit>
|
||||
@@ -97,4 +97,4 @@ namespace AzToolsFramework
|
||||
} // namespace LogPanel
|
||||
} // namespace AzToolsFramework
|
||||
|
||||
#include "UI/Logging/moc_NewLogTabDialog.cpp"
|
||||
#include "UI/Logging/moc_NewLogTabDialog.cpp"
|
||||
|
||||
Reference in New Issue
Block a user