GIT_SILENT: we depend against qt5.7 now. Clean up

CMakeLists.txt

@@ -26,7 +26,7 @@ include(ECMCoverageOption)
 set(CALENDARSUPPORT_LIB_VERSION ${PIM_VERSION})
 set(AKONADI_MIMELIB_VERSION "5.5.40")
 set(KDEPIM_LIB_VERSION "5.5.40")
-set(QT_REQUIRED_VERSION "5.6.0")
+set(QT_REQUIRED_VERSION "5.7.0")
 set(KMIME_LIB_VERSION "5.5.40")
 set(CALENDARUTILS_LIB_VERSION "5.5.40")
 set(KCALENDARCORE_LIB_VERSION "5.5.40")

src/calendarutils.cpp

@@ -27,7 +27,7 @@
 
 #include "calendarutils.h"
 #include "utils.h"
-#include "helper_p.h"
+
 
 #include <KCalCore/Incidence>
 #include <Akonadi/Calendar/ETMCalendar>

src/categoryhierarchyreader.cpp

@@ -19,7 +19,7 @@
 
 #include "categoryhierarchyreader.h"
 #include "categoryconfig.h"
-#include "helper_p.h"
+
 
 #include <KComboBox>
 

src/eventarchiver.cpp

@@ -26,7 +26,7 @@
 
 #include "kcalprefs.h"
 #include "utils.h"
-#include "helper_p.h"
+
 #include <Akonadi/Calendar/IncidenceChanger>
 
 #include <KCalCore/ICalFormat>

src/freebusymodel/autotests/testfreebusyitemmodel.cpp

@@ -31,12 +31,7 @@ using namespace CalendarSupport;
 
 // Workaround QTBUG-51789 causing a crash when QtWebEngineWidgets
 // is linked into a QCoreApplication.
-// TODO: Remove once we hard-depend on Qt 5.7
-#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
 QTEST_GUILESS_MAIN(FreeBusyItemModelTest)
-#else
-QTEST_MAIN(FreeBusyItemModelTest)
-#endif
 
 void FreeBusyItemModelTest::testModelValidity()
 {

src/freebusymodel/autotests/testfreeperiodmodel.cpp

@@ -31,12 +31,7 @@ using namespace CalendarSupport;
 
 // Workaround QTBUG-51789 causing a crash when QtWebEngineWidgets
 // is linked into a QCoreApplication.
-// TODO: Remove once we hard-depend on Qt 5.7
-#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
 QTEST_GUILESS_MAIN(FreePeriodModelTest)
-#else
-QTEST_MAIN(FreePeriodModelTest)
-#endif
 
 void FreePeriodModelTest::testModelValidity()
 {

src/freebusymodel/freebusyitemmodel.cpp

@@ -19,7 +19,7 @@
 */
 
 #include "freebusyitemmodel.h"
-#include "helper_p.h"
+
 
 #include <Akonadi/Calendar/FreeBusyManager>
 

src/helper_p.h

-/*
-    Copyright (c) 2017 Laurent Montel <montel@kde.org>
-
-    This library is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Library General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    This library 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 Library General Public
-    License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA.
-*/
-
-#ifndef _HELPER_H
-#define _HELPER_H
-#include <qglobal.h>
-
-#if QT_VERSION < QT_VERSION_CHECK(5,7,0)
-namespace QtPrivate
-{
-template <typename T> struct QAddConst {
-    typedef const T Type;
-};
-}
-
-// this adds const to non-const objects (like std::as_const)
-template <typename T>
-Q_DECL_CONSTEXPR typename QtPrivate::QAddConst<T>::Type &qAsConst(T &t) Q_DECL_NOTHROW { return t; }
-// prevent rvalue arguments:
-template <typename T>
-void qAsConst(const T &&) Q_DECL_EQ_DELETE;
-#endif
-
-#endif

src/printing/calprintdefaultplugins.cpp

@@ -28,7 +28,7 @@
 #include "calprintdefaultplugins.h"
 #include "kcalprefs.h"
 #include "utils.h"
-#include "helper_p.h"
+
 
 #include <Item>
 

src/printing/calprintpluginbase.cpp

@@ -27,7 +27,7 @@
 #include "cellitem.h"
 #include "kcalprefs.h"
 #include "utils.h"
-#include "helper_p.h"
+
 
 #include <Item>
 

src/printing/journalprint.cpp

@@ -24,7 +24,7 @@
 #include "utils.h"
 #include <KConfigGroup>
 #include "calendarsupport_debug.h"
-#include "helper_p.h"
+
 
 using namespace CalendarSupport;
 

src/utils.cpp

@@ -24,7 +24,7 @@
 
 #include "utils.h"
 #include "kcalprefs.h"
-#include "helper_p.h"
+
 
 #include <Collection>
 #include <CollectionDialog>