Merge branch 'Applications/17.04'

diff --cc src/dolphintabpage.h
index 85295bf920ff71d6c2d4025b44e133e5cc168bee,45c540775fe127c73dc3d2c61b90862367d9901f..b8772602d15cf50b110494c23c0b2b585c698f34
--- 1/src/dolphintabpage.h
--- 2/src/dolphintabpage.h
+++ b/src/dolphintabpage.h
@@@ -127,8 -127,14 +127,14 @@@ public
       * @deprecated The first tab state version has no version number, we keep
       *             this method to restore old states (<= Dolphin 4.14.x).
       */
 -    void restoreStateV1(const QByteArray& state);
 +    Q_DECL_DEPRECATED void restoreStateV1(const QByteArray& state);
  
+     /**
+      * Set whether the tab page is active
+      *
+      */
+     void setActive(bool active);
+ 
  signals:
      void activeViewChanged(DolphinViewContainer* viewContainer);
      void activeViewUrlChanged(const QUrl& url);