diff options
| author | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2018-10-17 11:04:01 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2018-10-18 08:58:42 +0000 |
| commit | 510029c1d1974d3e0d417e87da30261357fec510 (patch) | |
| tree | 9c89094f221c33d46a9a3ff13242a3995459bbed /src/Authoring/Studio/Palettes/BasicObjects/BasicObjectsModel.cpp | |
| parent | 4430b2eb13f2b37068b4af65d0ec038d30ff0233 (diff) | |
Clean up StudioUtils
Made StudioUtils a class of static functions instead of global
functions. Also cleaned up the code a bit where changes happened
because of this change.
Change-Id: Ic583dd25bf228c7e344be6664b6651958d84906e
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Janne Kangas <janne.kangas@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/Authoring/Studio/Palettes/BasicObjects/BasicObjectsModel.cpp')
| -rw-r--r-- | src/Authoring/Studio/Palettes/BasicObjects/BasicObjectsModel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Authoring/Studio/Palettes/BasicObjects/BasicObjectsModel.cpp b/src/Authoring/Studio/Palettes/BasicObjects/BasicObjectsModel.cpp index 867a441b..8694fda7 100644 --- a/src/Authoring/Studio/Palettes/BasicObjects/BasicObjectsModel.cpp +++ b/src/Authoring/Studio/Palettes/BasicObjects/BasicObjectsModel.cpp @@ -78,7 +78,7 @@ QVariant BasicObjectsModel::data(const QModelIndex &index, int role) const switch (role) { case NameRole: return m_ObjectItems.at(row).name(); - case IconRole: return resourceImageUrl() + + case IconRole: return StudioUtils::resourceImageUrl() + m_ObjectItems.at(row).icon(); case ObjectTypeRole: return m_ObjectItems.at(row).objectType(); case PrimitiveTypeRole: return m_ObjectItems.at(row).primitiveType(); |