resolving merge conflict due to variable name change from main

main
mgwynn 5 years ago
parent 155271a0ee
commit d2f8e49037

@ -16,7 +16,7 @@ namespace O3DE::ProjectManager
{
ProjectInfo::ProjectInfo(const QString& path, const QString& projectName, const QString& displayName,
const QString& origin, const QString& summary, const QString& imagePath, const QString& backgroundImagePath,
bool isNew)
bool needsBuild)
: m_path(path)
, m_projectName(projectName)
, m_displayName(displayName)
@ -24,7 +24,7 @@ namespace O3DE::ProjectManager
, m_summary(summary)
, m_imagePath(imagePath)
, m_backgroundImagePath(backgroundImagePath)
, m_isNew(isNew)
, m_needsBuild(needsBuild)
{
m_userTags = QStringList();
m_userTagsForRemoval = QStringList();

@ -25,7 +25,7 @@ namespace O3DE::ProjectManager
public:
ProjectInfo() = default;
ProjectInfo(const QString& path, const QString& projectName, const QString& displayName, const QString& origin,
const QString& summary, const QString& imagePath, const QString& backgroundImagePath, bool isNew);
const QString& summary, const QString& imagePath, const QString& backgroundImagePath, bool needsBuild);
bool operator==(const ProjectInfo& rhs);
bool operator!=(const ProjectInfo& rhs);
@ -46,7 +46,7 @@ namespace O3DE::ProjectManager
QString m_backgroundImagePath;
// Used in project creation
bool m_isNew = false; //! Is this a new project or existing
bool m_needsBuild = false; //! Is this a new project or existing
// Used to flag tags for removal
QStringList m_userTagsForRemoval;

Loading…
Cancel
Save