diff widgets/LayerTree.cpp @ 946:36cddc3de023 alignment_view

Merge from default branch
author Chris Cannam
date Mon, 20 Apr 2015 09:19:52 +0100
parents 4a578a360011
children a34a2a25907c
line wrap: on
line diff
--- a/widgets/LayerTree.cpp	Thu Jan 15 16:00:53 2015 +0000
+++ b/widgets/LayerTree.cpp	Mon Apr 20 09:19:52 2015 +0100
@@ -253,7 +253,7 @@
 int
 ModelMetadataModel::rowCount(const QModelIndex &parent) const
 {
-    if (!parent.isValid()) return m_models.size();
+    if (!parent.isValid()) return int(m_models.size());
     return 0;
 }