Merge branch 'master' into 1.4

This commit is contained in:
Arin Alex
2016-11-01 22:32:02 +03:00
3 changed files with 9 additions and 6 deletions

View File

@@ -748,7 +748,10 @@ void BandDesignIntf::childBandDeleted(QObject *band)
QColor BandDesignIntf::alternateBackgroundColor() const
{
return m_alternateBackgroundColor;
if (metaObject()->indexOfProperty("alternateBackgroundColor")!=-1)
return m_alternateBackgroundColor;
else
return backgroundColor();
}
void BandDesignIntf::setAlternateBackgroundColor(const QColor &alternateBackgroundColor)