Merge branch 'develop' into feature/images-for-resource-page

This commit is contained in:
Rachel Powers 2023-05-28 12:01:49 -07:00
commit b28f682ad9
120 changed files with 1978 additions and 603 deletions

View file

@ -19,7 +19,7 @@
#include "settings/Setting.h"
#include "tasks/Task.h"
ResourceFolderModel::ResourceFolderModel(QDir dir, std::shared_ptr<const BaseInstance> instance, QObject* parent, bool create_dir)
ResourceFolderModel::ResourceFolderModel(QDir dir, BaseInstance* instance, QObject* parent, bool create_dir)
: QAbstractListModel(parent), m_dir(dir), m_instance(instance), m_watcher(this)
{
if (create_dir) {