diff widgets/LayerTree.cpp @ 663:1a0fdad4af4d tonioni

Merge from the default branch
author Chris Cannam
date Fri, 12 Jul 2013 13:25:22 +0100
parents d632a1e87018
children 1a0dfcbffaf1
line wrap: on
line diff
--- a/widgets/LayerTree.cpp	Thu Jun 20 13:47:36 2013 +0100
+++ b/widgets/LayerTree.cpp	Fri Jul 12 13:25:22 2013 +0100
@@ -238,7 +238,7 @@
 {
     if (!parent.isValid()) {
         if (row >= m_models.size()) return QModelIndex();
-	return createIndex(row, column, 0);
+	return createIndex(row, column, (void *)0);
     }
 
     return QModelIndex();