Merge branch 'master' into frameworks

Conflicts:
	dolphin/src/panels/places/placesitemmodel.cpp
	kdepasswd/kcm/CMakeLists.txt [deleted in frameworks]
	kdepasswd/kcm/main.cpp [deleted in frameworks]

diff --combined src/panels/information/pixmapviewer.cpp
index 221db8c70ff7b192a97ae5a8df6a0d96c41d89f4,45a8c17e222d1bb64f5d1a185b706c2554e02a24..7b3a212f2e64f76c170a2251fd52e9e1cda31c6e
--- 1/src/panels/information/pixmapviewer.cpp
--- 2/src/panels/information/pixmapviewer.cpp
+++ b/src/panels/information/pixmapviewer.cpp
@@@ -39,8 -39,8 +39,8 @@@ PixmapViewer::PixmapViewer(QWidget* par
      m_animation.setCurveShape(QTimeLine::LinearCurve);
  
      if (m_transition != NoTransition) {
 -        connect(&m_animation, SIGNAL(valueChanged(qreal)), this, SLOT(update()));
 -        connect(&m_animation, SIGNAL(finished()), this, SLOT(checkPendingPixmaps()));
 +        connect(&m_animation, &QTimeLine::valueChanged, this, static_cast<void(PixmapViewer::*)()>(&PixmapViewer::update));
 +        connect(&m_animation, &QTimeLine::finished, this, &PixmapViewer::checkPendingPixmaps);
      }
  }
  
@@@ -102,11 -102,13 +102,13 @@@ void PixmapViewer::paintEvent(QPaintEve
          const bool useOldPixmap = (m_transition == SizeTransition) &&
                                    (m_oldPixmap.width() > m_pixmap.width());
          const QPixmap& largePixmap = useOldPixmap ? m_oldPixmap : m_pixmap;
-         const QPixmap scaledPixmap = largePixmap.scaled(scaledWidth,
-                                                         scaledHeight,
-                                                         Qt::IgnoreAspectRatio,
-                                                         Qt::FastTransformation);
-         painter.drawPixmap(x, y, scaledPixmap);
+       if (!largePixmap.isNull()) {
+             const QPixmap scaledPixmap = largePixmap.scaled(scaledWidth,
+                                                             scaledHeight,
+                                                             Qt::IgnoreAspectRatio,
+                                                             Qt::FastTransformation);
+             painter.drawPixmap(x, y, scaledPixmap);
+       }
      } else {
          const int x = (width()  - m_pixmap.width() ) / 2;
          const int y = (height() - m_pixmap.height()) / 2;
@@@ -127,3 -129,4 +129,3 @@@ void PixmapViewer::checkPendingPixmaps(
      }
  }
  
 -#include "pixmapviewer.moc"

diff --combined src/settings/kcm/kcmdolphingeneral.desktop
index a14ec500bd6fb268c225b2ab133d7a1bbf4a32f8,1f76d7e2a9a36511281d5d1283ca0ffbe2ba3d27..a30b6b5908ff2d6e23206f1a93916bab747e65b9
--- 1/src/settings/kcm/kcmdolphingeneral.desktop
--- 2/src/settings/kcm/kcmdolphingeneral.desktop
+++ b/src/settings/kcm/kcmdolphingeneral.desktop
@@@ -117,7 -117,7 +117,7 @@@ Comment[nds]=Mit dissen Deenst laat si
  Comment[nl]=Met deze dienst kunt u algemene Dolphin-instellingen configureren.
  Comment[nn]=Denne tenesta lèt deg setja opp generelle innstillingar for Dolphin.
  Comment[pa]=ਇਹ ਸਰਵਿਸ ਆਮ ਡਾਲਫਿਨ ਸੈਟਿੰਗ ਦੀ ਸੰਰਚਨਾ ਵਾਸਤੇ ਹੈ।
- Comment[pl]=Ta usługa pozwala na konfigurację ogólnych ustawień Dolphina.
+ Comment[pl]=Ta usługa pozwala na ogólne ustawienie Dolphina.
  Comment[pt]=Este serviço permite-lhe configurar as opções gerais do Dolphin.
  Comment[pt_BR]=Este serviço permite configurar as opções gerais do Dolphin.
  Comment[ro]=Acest serviciu permite configurarea opțiunilor generale ale lui Dolphin.
@@@ -144,7 -144,7 +144,7 @@@ Comment[zh_TW]=此服務允許設定 Do
  Icon=system-run
  Type=Service
  X-KDE-ServiceTypes=KCModule
 -Exec=kcmshell4 kcmdolphingeneral
 +Exec=kcmshell5 kcmdolphingeneral
  
  X-KDE-Library=kcm_dolphingeneral
  X-KDE-PluginKeyword=dolphingeneral
@@@ -272,7 -272,7 +272,7 @@@ Comment[nds]=Den Dateipleger allmeen in
  Comment[nl]=Algemene bestandsbeheerderinstellingen configureren
  Comment[nn]=Set opp generelle innstillingar for filhandsamaren
  Comment[pa]=ਆਮ ਫਾਇਲ ਮੈਨੇਜਰ ਸੈਟਿੰਗ ਸੰਰਚਨਾ
- Comment[pl]=Konfiguracja ogólnych ustawień zarządzania plikami
+ Comment[pl]=Ustawienia ogólne zarządzania plikami
  Comment[pt]=Configurar as opções gerais do gestor de ficheiros
  Comment[pt_BR]=Configura as opções gerais do gerenciador de arquivos
  Comment[ro]=Configurează opțiunile generale ale gestionarul de fișiere

diff --combined src/settings/kcm/kcmdolphinnavigation.desktop
index ea1516a1d9c0e1166caf51bccd5c0bed6de2ef49,0b26b8ca6f7bbb0a405f20ba962e36b8701e8536..a9362a996de4475a8e8ae6c278f049aedc9bb0bd
--- 1/src/settings/kcm/kcmdolphinnavigation.desktop
--- 2/src/settings/kcm/kcmdolphinnavigation.desktop
+++ b/src/settings/kcm/kcmdolphinnavigation.desktop
@@@ -118,7 -118,7 +118,7 @@@ Comment[nds]=Mit dissen Deenst lett si
  Comment[nl]=Met deze dienst kunt u Dolphin-navigatie configureren.
  Comment[nn]=Denne tenesta lèt deg setja opp navigasjonen for Dolphin.
  Comment[pa]=ਇਹ ਸਰਵਿਸ ਡਾਲਫਿਨ ਨੇਵੀਗੇਸ਼ਨ ਦੀ ਸੰਰਚਨਾ ਵਾਸਤੇ ਹੈ।
- Comment[pl]=Ta usługa umożliwia konfigurację nawigacji w Dolphinie.
+ Comment[pl]=Ta usługa umożliwia ustawienie nawigacji w Dolphinie.
  Comment[pt]=Este serviço permite-lhe configurar a navegação do Dolphin.
  Comment[pt_BR]=Este serviço permite configurar a navegação do Dolphin.
  Comment[ro]=Acest serviciu permite configurarea navigării Dolphin.
@@@ -145,7 -145,7 +145,7 @@@ Comment[zh_TW]=此服務允許設定 Do
  Icon=input-mouse
  Type=Service
  X-KDE-ServiceTypes=KCModule
 -Exec=kcmshell4 kcmdolphinnavigation
 +Exec=kcmshell5 kcmdolphinnavigation
  
  X-KDE-Library=kcm_dolphinnavigation
  X-KDE-PluginKeyword=dolphinnavigation
@@@ -272,7 -272,7 +272,7 @@@ Comment[nds]=De Dateipleger-Navigeren i
  Comment[nl]=Bestandsbeheerdernavigatie configureren
  Comment[nn]=Set opp navigasjonen i filhandsamaren
  Comment[pa]=ਫਾਇਲ ਮੈਨੇਜਰ ਨੇਵੀਗੇਸ਼ਨ ਸੰਰਚਨਾ
- Comment[pl]=Konfiguracja nawigacji w zarządzaniu plikami
+ Comment[pl]=Ustawienia nawigacji w zarządzaniu plikami
  Comment[pt]=Configurar a navegação do gestor de ficheiros
  Comment[pt_BR]=Configura a navegação do gerenciador de arquivos
  Comment[ro]=Configurează navigarea gestionarului de fișiere

diff --combined src/settings/kcm/kcmdolphinservices.desktop
index 7e232ee52db2d2fc7fc927d3303479a63ea20394,81d3ce38992f1b6ff0df81e39ee1b8ac0debc3ec..25710e019f15f902326f776e65df9fad94401d7b
--- 1/src/settings/kcm/kcmdolphinservices.desktop
--- 2/src/settings/kcm/kcmdolphinservices.desktop
+++ b/src/settings/kcm/kcmdolphinservices.desktop
@@@ -74,7 -74,7 +74,7 @@@ Name[zh_TW]=Dolphin æ\9c\8då\8b
  Icon=services
  Type=Service
  X-KDE-ServiceTypes=KCModule
 -Exec=kcmshell4 kcmdolphinservices
 +Exec=kcmshell5 kcmdolphinservices
  
  X-KDE-Library=kcm_dolphinservices
  X-KDE-PluginKeyword=dolphinservices
@@@ -222,7 -222,7 +222,7 @@@ Comment[nds]=Dateipleger-Deensten inste
  Comment[nl]=Bestandsbeheerderservices configureren
  Comment[nn]=Set opp tenester i filhandsamaren
  Comment[pa]=ਫਾਇਲ ਮੈਨੇਜਰ ਸਰਵਿਸ ਸੰਰਚਨਾ
- Comment[pl]=Konfiguracja usług zarządzania plikami
+ Comment[pl]=Ustawienia usług zarządzania plikami
  Comment[pt]=Configurar os serviços do gestor de ficheiros
  Comment[pt_BR]=Configura os serviços do gerenciador de arquivos
  Comment[ro]=Configurează serviciile gestionarului de fișiere

diff --combined src/settings/kcm/kcmdolphinviewmodes.desktop
index d091aff22a7b8de4c96a23d6c4c05df38120e160,f5f1fbd2237e54be12c176a763678395fc289c93..3856fc67678b4f7b2fa79b26a46b38a09c3ee7b1
--- 1/src/settings/kcm/kcmdolphinviewmodes.desktop
--- 2/src/settings/kcm/kcmdolphinviewmodes.desktop
+++ b/src/settings/kcm/kcmdolphinviewmodes.desktop
@@@ -116,7 -116,7 +116,7 @@@ Comment[nds]=Mit dissen Deenst laat si
  Comment[nl]=Met deze dienst kunt u Dolphin-weergavemodussen configureren.
  Comment[nn]=Denne tenesta lèt deg setja opp Dolphin-visingar.
  Comment[pa]=ਇਹ ਸਰਵਿਸ ਡਾਲਫਿਨ ਝਲਕ ਮੋਡ ਦੀ ਸੰਰਚਨਾ ਵਾਸਤੇ ਹੈ।
- Comment[pl]=Ta usługa umożliwia konfigurację trybów widoku Dolphina.
+ Comment[pl]=Ta usługa umożliwia ustawienie trybów widoku Dolphina.
  Comment[pt]=Este serviço permite-lhe configurar os modos de visualização do Dolphin.
  Comment[pt_BR]=Este serviço permite configurar os modos de exibição do Dolphin.
  Comment[ro]=Acest serviciu permite configurarea regimurilor de vizualizare Dolphin.
@@@ -143,7 -143,7 +143,7 @@@ Comment[zh_TW]=此服務允許設定 Do
  Icon=view-choose
  Type=Service
  X-KDE-ServiceTypes=KCModule
 -Exec=kcmshell4 kcmdolphinviewmodes
 +Exec=kcmshell5 kcmdolphinviewmodes
  
  X-KDE-Library=kcm_dolphinviewmodes
  X-KDE-PluginKeyword=dolphinviewmodes
@@@ -270,7 -270,7 +270,7 @@@ Comment[nds]=Den Dateipleger sien Ansic
  Comment[nl]=Bestandsbeheerderweergavemodussen configureren
  Comment[nn]=Set opp visingsmodusane i filhandsamaren
  Comment[pa]=ਫਾਇਲ ਮੈਨੇਜਰ ਝਲਕ ਮੋਡ ਸੰਰਚਨਾ
- Comment[pl]=Konfiguracja trybów widoku zarządzania plikami
+ Comment[pl]=Ustawienia trybów widoku zarządzania plikami
  Comment[pt]=Configurar os modos de visualização do gestor de ficheiros
  Comment[pt_BR]=Configura os modos de exibição do gerenciador de arquivos
  Comment[ro]=Configurează regimurile de vizualizare ale gestionarului de fișiere