Merge remote-tracking branch 'upstream/development' into camera_and_editor_viewport_widget_improvements

Signed-off-by: Yuriy Toporovskyy <toporovskyy.y@gmail.com>
2021-08-06 10:32:38 -04:00
parent 6e59b1f519 053c4af66d
commit fd616fdcfb
425 changed files with 2145 additions and 1758 deletions
@@ -81,7 +81,7 @@ namespace Camera

        int CameraListModel::rowCount([[maybe_unused]] const QModelIndex& parent) const
        {
-            return m_cameraItems.size();
+            return static_cast<int>(m_cameraItems.size());
        }

        QVariant CameraListModel::data(const QModelIndex& index, int role) const