birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Integrating github/staging through commit 5f214be

Browse Source
This commit is contained in:
alexpete
2021-04-13 17:18:57 -07:00
parent 2a9dfb7a1d
commit 8469c9ca0a
904 changed files with 9289 additions and 7157 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Sandbox/Editor/DatabaseFrameWnd.cpp
+4 -4
View File
@@ -1336,7 +1336,7 @@ bool LibraryItemTreeModel::DoesGroupExist([[maybe_unused]] const QString& groupN
QStringList LibraryItemTreeModel::mimeTypes() const
{
QStringList mimeTypes;
mimeTypes << QStringLiteral("application/x-lumberyard-libraryitems");
mimeTypes << QStringLiteral("application/x-o3de-libraryitems");
return mimeTypes;
}
@@ -1412,9 +1412,9 @@ bool LibraryItemTreeModel::MoveItem(CBaseLibraryItem* item, const QModelIndex& t
bool LibraryItemTreeModel::dropMimeData(const QMimeData* data, [[maybe_unused]] Qt::DropAction action, [[maybe_unused]] int row, [[maybe_unused]] int column, const QModelIndex& index)
{
if (data->hasFormat("application/x-lumberyard-libraryitems"))
if (data->hasFormat("application/x-o3de-libraryitems"))
{
QByteArray array = data->data("application/x-lumberyard-libraryitems");
QByteArray array = data->data("application/x-o3de-libraryitems");
QModelIndex targetParent = index;
@@ -1474,7 +1474,7 @@ QMimeData* LibraryItemTreeModel::mimeData(const QModelIndexList& indexes) const
}
QMimeData* data = new QMimeData;
data->setData(QStringLiteral("application/x-lumberyard-libraryitems"), array);
data->setData(QStringLiteral("application/x-o3de-libraryitems"), array);
return data;
}