Mercurial > hg > svgui
diff widgets/LayerTree.cpp @ 640:c6d705bf1672
Merge from branch "qt5". This revision actually builds with Qt4 (late releases) or Qt5, though it will warn on configure with Qt4.
author | Chris Cannam |
---|---|
date | Tue, 14 May 2013 12:36:43 +0100 |
parents | d632a1e87018 |
children | 1a0dfcbffaf1 |
line wrap: on
line diff
--- a/widgets/LayerTree.cpp Tue Apr 16 15:17:33 2013 +0100 +++ b/widgets/LayerTree.cpp Tue May 14 12:36:43 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();