Merge remote-tracking branch 'origin/3.4'

This commit is contained in:
Eike Ziller
2015-04-23 09:39:09 +02:00
34 changed files with 357 additions and 101 deletions

View File

@@ -219,7 +219,7 @@ ToolTipWatchItem::ToolTipWatchItem(WatchItem *item)
value = item->displayValue();
type = item->displayType();
iname = item->iname;
valueColor = item->valueColor();
valueColor = item->valueColor(1);
expandable = item->hasChildren();
expression = item->expression();
foreach (TreeItem *child, item->children())