From: Elvis Angelaccio <elvis.angelaccio@kde.org>
Date: Sat, 21 Jan 2017 22:43:09 +0000 (+0100)
Subject: Merge branch 'Applications/16.12'
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/a874e52b155a17f0b13685cd03081188b8523822?hp=-c

Merge branch 'Applications/16.12'
---

a874e52b155a17f0b13685cd03081188b8523822
diff --combined src/panels/information/informationpanelcontent.cpp
index 9478aaf45,f56f5eaf6..fa4868e52
--- a/src/panels/information/informationpanelcontent.cpp
+++ b/src/panels/information/informationpanelcontent.cpp
@@@ -142,10 -142,6 +142,6 @@@ InformationPanelContent::InformationPan
      QWidget* viewport = m_metaDataArea->viewport();
      viewport->installEventFilter(this);
  
-     QPalette palette = viewport->palette();
-     palette.setColor(viewport->backgroundRole(), QColor(Qt::transparent));
-     viewport->setPalette(palette);
- 
      layout->addWidget(m_preview);
      layout->addWidget(m_phononWidget);
      layout->addWidget(m_nameLabel);
@@@ -195,7 -191,7 +191,7 @@@ void InformationPanelContent::showItem(
              m_previewJob = new KIO::PreviewJob(KFileItemList() << item, QSize(m_preview->width(), m_preview->height()));
              m_previewJob->setScaleType(KIO::PreviewJob::Unscaled);
              m_previewJob->setIgnoreMaximumSize(item.isLocalFile());
 -            if (m_previewJob->ui()) {
 +            if (m_previewJob->uiDelegate()) {
                  KJobWidgets::setWindow(m_previewJob, this);
              }