Merge branch 'KDE/4.14'

diff --combined src/dolphintabpage.cpp
index d1184a9f2c53063999b4f693002388cc71c3f6db,4c49869f77e07d4341b76d450f827ae73199b108..23e33c95833b308222afec9f93c8121ea8489928
--- 1/src/dolphintabpage.cpp
--- 2/src/dolphintabpage.cpp
+++ b/src/dolphintabpage.cpp
@@@ -187,6 -187,10 +187,10 @@@ QByteArray DolphinTabPage::saveState() 
  
  void DolphinTabPage::restoreState(const QByteArray& state)
  {
+     if (state.isEmpty()) {
+         return;
+     }
+ 
      QByteArray sd = state;
      QDataStream stream(&sd, QIODevice::ReadOnly);
  
@@@ -246,7 -250,7 +250,7 @@@ void DolphinTabPage::slotViewActivated(
      }
  
      emit activeViewUrlChanged(activeViewContainer()->url());
 -    emit activeViewChanged();
 +    emit activeViewChanged(activeViewContainer());
  }
  
  DolphinViewContainer* DolphinTabPage::createViewContainer(const KUrl& url) const