From: Luca Beltrame <lbeltrame@kde.org>
Date: Mon, 22 May 2017 21:32:36 +0000 (+0200)
Subject: Merge branch 'Applications/17.04'
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/95f9dc9de00e4663ade9506bd1b7b58816d13458

Merge branch 'Applications/17.04'
---

95f9dc9de00e4663ade9506bd1b7b58816d13458
diff --cc src/dolphintabpage.h
index 85295bf92,45c540775..b8772602d
--- a/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);