diff widgets/LayerTree.cpp @ 922:26da827e8fb5 tonioni

Merge from cxx11 branch
author Chris Cannam
date Mon, 23 Mar 2015 11:26:28 +0000
parents 4a578a360011
children a34a2a25907c
line wrap: on
line diff
--- a/widgets/LayerTree.cpp	Mon Mar 23 10:04:51 2015 +0000
+++ b/widgets/LayerTree.cpp	Mon Mar 23 11:26:28 2015 +0000
@@ -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;
 }