Mercurial > hg > svcore

diff base/PropertyContainer.cpp @ 1365:3382d914e110

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch 3.0-integration
author Chris Cannam
date Fri, 13 Jan 2017 10:29:44 +0000
parents 576be7933ec7
children 48e9f538e6e9
line wrap: on
line diff
--- a/base/PropertyContainer.cpp	Mon Nov 21 16:32:58 2016 +0000
+++ b/base/PropertyContainer.cpp	Fri Jan 13 10:29:44 2017 +0000
@@ -59,6 +59,12 @@
     return QString();
 }
 
+QString
+PropertyContainer::getPropertyValueIconName(const PropertyName &, int) const
+{
+    return QString();
+}
+
 RangeMapper *
 PropertyContainer::getNewPropertyRangeMapper(const PropertyName &) const
 {
@@ -172,6 +178,7 @@
 
     case ValueProperty:
     case ColourProperty:
+    case ColourMapProperty:
     {
         int min, max;
         getPropertyRangeAndValue(name, &min, &max, 0);