Merge branch 'Applications/15.08'

diff --combined CMakeLists.txt
index 36feb87ca446bd56e4a1fcf21b88aa6d15395854,22da59632838ec7a4a60cc46d66449b93b1d46cd..df70c7c132fe5bb8cb5363889d7c96b67f81bc53
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -5,11 -5,11 +5,11 @@@ project(Dolphin
  # KDE Application Version, managed by release script
  set (KDE_APPLICATIONS_VERSION_MAJOR "15")
  set (KDE_APPLICATIONS_VERSION_MINOR "08")
- set (KDE_APPLICATIONS_VERSION_MICRO "1")
+ set (KDE_APPLICATIONS_VERSION_MICRO "3")
  set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}")
  
  set(QT_MIN_VERSION "5.4.0")
 -set(KF5_MIN_VERSION "5.7.0")
 +set(KF5_MIN_VERSION "5.16.0")
  set(ECM_MIN_VERSION "1.6.0")
  
  # ECM setup
@@@ -29,13 -29,13 +29,13 @@@ ecm_setup_version(${KDE_APPLICATIONS_VE
                    VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/src/dolphin_version.h"
  )
  
 -ecm_setup_version(${KDE_APPLICATIONS_VERSION} VARIABLE_PREFIX DOLPHINVCS
 +ecm_setup_version("5.0.0" VARIABLE_PREFIX DOLPHINVCS
                    VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/dolphinvcs_version.h"
                    PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/DolphinVcsConfigVersion.cmake"
                    SOVERSION 5
  )
  
 -ecm_setup_version(${KDE_APPLICATIONS_VERSION} VARIABLE_PREFIX DOLPHINPRIVATE
 +ecm_setup_version("5.0.0" VARIABLE_PREFIX DOLPHINPRIVATE
                    SOVERSION 5
  )
  
@@@ -62,7 -62,7 +62,7 @@@ find_package(KF5 ${KF5_MIN_VERSION} REQ
      Solid
      IconThemes
      Completion
 -    TextEditor
 +    TextWidgets
      WindowSystem
      Notifications
  )

diff --combined src/dolphinmainwindow.cpp
index 5a731512b9f71091b635d5e2cfb2771a79ff2e53,1cde29ce21919f03686b94e14203cbf90a71c0c0..9b05168fd57c522af1210526123d980d35b34b4d
--- 1/src/dolphinmainwindow.cpp
--- 2/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@@ -21,6 -21,7 +21,7 @@@
  
  #include "dolphinmainwindow.h"
  
+ #include "global.h"
  #include "dolphindockwidget.h"
  #include "dolphincontextmenu.h"
  #include "dolphinnewfilemenu.h"
@@@ -639,7 -640,7 +640,7 @@@ void DolphinMainWindow::goHome(Qt::Mous
  {
      // The default case (left button pressed) is handled in goHome().
      if (buttons == Qt::MiddleButton) {
-         openNewTab(GeneralSettings::self()->homeUrl());
+         openNewTab(Dolphin::homeUrl());
      }
  }
  
@@@ -1335,7 -1336,7 +1336,7 @@@ void DolphinMainWindow::createControlBu
      Q_ASSERT(!m_controlButton);
  
      m_controlButton = new QToolButton(this);
 -    m_controlButton->setIcon(QIcon::fromTheme("applications-system"));
 +    m_controlButton->setIcon(QIcon::fromTheme("application-menu"));
      m_controlButton->setText(i18nc("@action", "Control"));
      m_controlButton->setPopupMode(QToolButton::InstantPopup);
      m_controlButton->setToolButtonStyle(toolBar()->toolButtonStyle());