diff --git a/CMakeLists.txt b/CMakeLists.txt
index 539cb17..774c33c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,53 +1,57 @@
 project(dolphin-plugins)
 
 cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
 
 include(FeatureSummary)
 
 set(QT_MIN_VERSION "5.8.0")
 set(KF5_MIN_VERSION "5.0.0")
 
 find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
     Core
     Widgets
     Network
 )
 
 find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
 find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
     XmlGui
     I18n
     KIO
     TextWidgets
 )
 
 find_package(DolphinVcs)
 set_package_properties(DolphinVcs PROPERTIES
     DESCRIPTION "the Dolphin version control plugin library"
     URL "http://dolphin.kde.org/"
     TYPE REQUIRED
     PURPOSE "Provides the version control plugin interface."
 )
 
 include(KDEInstallDirs)
 include(KDECMakeSettings)
 include(KDECompilerSettings)
 include(ECMMarkNonGuiExecutable)
 include(ECMOptionalAddSubdirectory)
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
+if (EXISTS "${CMAKE_SOURCE_DIR}/.git")
+   add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000)
+   add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x060000)
+endif()
 
 ecm_optional_add_subdirectory(svn)
 ecm_optional_add_subdirectory(git)
 ecm_optional_add_subdirectory(bazaar)
 ecm_optional_add_subdirectory(dropbox)
 ecm_optional_add_subdirectory(hg)
 
 install(FILES org.kde.dolphin-plugins.metainfo.xml
         DESTINATION ${KDE_INSTALL_METAINFODIR})
 
 feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/git/pulldialog.h b/git/pulldialog.h
index 168d2e8..7f3d0fe 100644
--- a/git/pulldialog.h
+++ b/git/pulldialog.h
@@ -1,45 +1,45 @@
 /******************************************************************************
  *   Copyright (C) 2010 by Sebastian Doerner <sebastian@sebastian-doerner.de> *
  *                                                                            *
  *   This program is free software; you can redistribute it and/or modify     *
  *   it under the terms of the GNU General Public License as published by     *
  *   the Free Software Foundation; either version 2 of the License, or        *
  *   (at your option) any later version.                                      *
  *                                                                            *
  *   This program is distributed in the hope that it will be useful,          *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of           *
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            *
  *   GNU General Public License for more details.                             *
  *                                                                            *
  *   You should have received a copy of the GNU General Public License        *
  *   along with this program; if not, write to the                            *
  *   Free Software Foundation, Inc.,                                          *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA               *
  ******************************************************************************/
 
 #ifndef PULLDIALOG_H
 #define PULLDIALOG_H
 
 #include <QDialog>
-
+#include <QHash>
 class QComboBox;
 class QDialogButtonBox;
 
 class PullDialog : public QDialog
 {
     Q_OBJECT
 
 public:
     explicit PullDialog(QWidget* parent = 0);
     QString source() const;
     QString remoteBranch() const;
 private:
     QDialogButtonBox *m_buttonBox;
     QComboBox * m_remoteComboBox;
     QComboBox * m_remoteBranchComboBox;
     QHash<QString, QStringList> m_remoteBranches;
 private slots:
     void remoteSelectionChanged(const QString& newRemote);
 };
 
 #endif // PULLDIALOG_H
diff --git a/git/pushdialog.h b/git/pushdialog.h
index 01a7910..cac428c 100644
--- a/git/pushdialog.h
+++ b/git/pushdialog.h
@@ -1,52 +1,52 @@
 /******************************************************************************
  *   Copyright (C) 2010 by Sebastian Doerner <sebastian@sebastian-doerner.de> *
  *                                                                            *
  *   This program is free software; you can redistribute it and/or modify     *
  *   it under the terms of the GNU General Public License as published by     *
  *   the Free Software Foundation; either version 2 of the License, or        *
  *   (at your option) any later version.                                      *
  *                                                                            *
  *   This program is distributed in the hope that it will be useful,          *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of           *
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            *
  *   GNU General Public License for more details.                             *
  *                                                                            *
  *   You should have received a copy of the GNU General Public License        *
  *   along with this program; if not, write to the                            *
  *   Free Software Foundation, Inc.,                                          *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA               *
  ******************************************************************************/
 
 #ifndef PUSHDIALOG_H
 #define PUSHDIALOG_H
 
 #include <QDialog>
-
+#include <QHash>
 class QCheckBox;
 class QComboBox;
 class QDialogButtonBox;
 
 class PushDialog : public QDialog
 {
     Q_OBJECT
 
 public:
     PushDialog(QWidget* parent = 0);
     QString destination() const;
     QString localBranch() const;
     QString remoteBranch() const;
     bool force() const;
 private slots:
     void remoteSelectionChanged(const QString& newRemote);
     void localBranchSelectionChanged(const QString& newLocalBranch);
 private:
     QHash<QString, QStringList> m_remoteBranches;
 
     QComboBox * m_remoteComboBox;
     QComboBox * m_localBranchComboBox;
     QComboBox * m_remoteBranchComboBox;
     QCheckBox * m_forceCheckBox;
     QDialogButtonBox * m_buttonBox;
 };
 
 #endif // PUSHDIALOG_H