Merge branch 'master' into colorpicker

2020-04-02 15:30:55 +11:00
parent f3290003be bfbb2e3fef
commit a2ed1035da
2 changed files with 6 additions and 6 deletions
@@ -70,7 +70,7 @@ void TimelineViewBlockItem::UpdateRect()
                                                                                  Timecode::time_to_timecode(block_->out() - block_->in(), timebase(), Core::instance()->GetTimecodeDisplay())));
 }

-void TimelineViewBlockItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget */*widget*/)
+void TimelineViewBlockItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *)
 {
  switch (block_->type()) {
  case Block::kClip: