Merge branch 'develop' into feature/UndoRedoWithModelData
This commit is contained in:
@ -76,7 +76,7 @@ void GenericCore::triggerApplicationUpdate() {
|
||||
|
||||
std::shared_ptr<QUndoStack> GenericCore::getModUndoStack() const { return m_modelUndoStack; }
|
||||
|
||||
std::shared_ptr<QAbstractItemModel> GenericCore::getModel() const { return m_mainModel; }
|
||||
std::shared_ptr<TableModel> GenericCore::getModel() const { return m_mainModel; }
|
||||
|
||||
void GenericCore::setupModels() {
|
||||
m_mainModel = make_shared<TableModel>(this);
|
||||
@ -88,7 +88,6 @@ QString GenericCore::getMaintenanceToolFilePath() const {
|
||||
|
||||
/// setting the applicationDirPath hard coded to test update feature from IDE
|
||||
#ifdef QT_DEBUG
|
||||
// REFACTOR retrieve application name automatically instead of using hard coded name
|
||||
applicationDirPath = QString("/opt/%1").arg(APPLICATION_NAME);
|
||||
#endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user