[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdenlive] src/dialogs: Merge branch '16.12'
From:       Jean-Baptiste Mardelle <jb () kdenlive ! org>
Date:       2016-11-21 18:28:23
Message-ID: E1c8tKJ-00082u-GK () code ! kde ! org
[Download RAW message or body]

Git commit 4dcab81daf5d9f7349866a34c2ce8a307934515a by Jean-Baptiste Mardelle.
Committed on 21/11/2016 at 18:28.
Pushed by mardelle into branch 'master'.

Merge branch '16.12'

M  +26   -9    src/dialogs/renderwidget.cpp

http://commits.kde.org/kdenlive/4dcab81daf5d9f7349866a34c2ce8a307934515a

diff --cc src/dialogs/renderwidget.cpp
index a2f028b,c367ae1..2986db2
--- a/src/dialogs/renderwidget.cpp
+++ b/src/dialogs/renderwidget.cpp
@@@ -288,8 -288,8 +288,8 @@@ RenderWidget::RenderWidget(const QStrin
      m_view.out_file->setMode(KFile::File);
      m_view.out_file->setFocusPolicy(Qt::ClickFocus);
  
--    m_view.running_jobs->setHeaderLabels(QStringList() << QString() << i18n("File"));
      m_jobsDelegate = new RenderViewDelegate(this);
++    m_view.running_jobs->setHeaderLabels(QStringList() << QString() << i18n("File"));
      m_view.running_jobs->setItemDelegate(m_jobsDelegate);
  
      QHeaderView *header = m_view.running_jobs->header();
[prev in list] [next in list] [prev in thread] [next in thread]