summaryrefslogtreecommitdiffstats
path: root/src/Authoring/Studio/Palettes/Inspector/ChooserModelBase.cpp
diff options
context:
space:
mode:
authorMahmoud Badri <mahmoud.badri@qt.io>2018-10-12 14:47:08 +0300
committerMahmoud Badri <mahmoud.badri@qt.io>2018-10-15 12:20:01 +0000
commit72c46338714da6418fe65a2e6c532a2621cd6875 (patch)
tree6152b6bce3867d737aabdd324e811bbcea7e8dac /src/Authoring/Studio/Palettes/Inspector/ChooserModelBase.cpp
parent9fe9cc9af651251b18d6cb932119f63636614393 (diff)
Drag and drop images to the timeline
- You can now drag images from the project palette to the timeline rows. Supported drop rows are layers, materials and images. - Relevant tweaks. Task-number: QT3DS-2267 Change-Id: I0646b47d31e38c89fe95461c7f2fb040a479b43e Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/Authoring/Studio/Palettes/Inspector/ChooserModelBase.cpp')
-rw-r--r--src/Authoring/Studio/Palettes/Inspector/ChooserModelBase.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Authoring/Studio/Palettes/Inspector/ChooserModelBase.cpp b/src/Authoring/Studio/Palettes/Inspector/ChooserModelBase.cpp
index f20c3425..1457a3c1 100644
--- a/src/Authoring/Studio/Palettes/Inspector/ChooserModelBase.cpp
+++ b/src/Authoring/Studio/Palettes/Inspector/ChooserModelBase.cpp
@@ -379,7 +379,7 @@ bool ChooserModelBase::isExpanded(const QModelIndex &modelIndex) const
EStudioObjectType ChooserModelBase::getIconType(const QString &path) const
{
- return Q3DStudio::ImportUtils::GetObjectFileTypeForFile(Q3DStudio::CFilePath(path)).m_IconType;
+ return Q3DStudio::ImportUtils::GetObjectFileTypeForFile(path).m_IconType;
}
QString ChooserModelBase::specialDisplayName(const ChooserModelBase::TreeItem &item) const