diff -Nru kmbox-17.04.3/autotests/mboxbenchmark.cpp kmbox-17.08.3/autotests/mboxbenchmark.cpp
--- kmbox-17.04.3/autotests/mboxbenchmark.cpp	2017-06-19 05:07:04.000000000 +0000
+++ kmbox-17.08.3/autotests/mboxbenchmark.cpp	2017-10-29 07:12:36.000000000 +0000
@@ -19,7 +19,7 @@
 
 #include "mboxbenchmark.h"
 
-#include <QtCore/QCryptographicHash>
+#include <QCryptographicHash>
 
 #include <qtest.h>
 #include <QTemporaryDir>
diff -Nru kmbox-17.04.3/autotests/mboxbenchmark.h kmbox-17.08.3/autotests/mboxbenchmark.h
--- kmbox-17.04.3/autotests/mboxbenchmark.h	2017-06-19 05:07:04.000000000 +0000
+++ kmbox-17.08.3/autotests/mboxbenchmark.h	2017-10-29 07:12:36.000000000 +0000
@@ -20,7 +20,7 @@
 #ifndef MBOXBENCHMARK_H
 #define MBOXBENCHMARK_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
 #include "mbox.h"
 
diff -Nru kmbox-17.04.3/autotests/mboxtest.cpp kmbox-17.08.3/autotests/mboxtest.cpp
--- kmbox-17.04.3/autotests/mboxtest.cpp	2017-06-19 05:07:04.000000000 +0000
+++ kmbox-17.08.3/autotests/mboxtest.cpp	2017-10-29 07:12:36.000000000 +0000
@@ -18,8 +18,8 @@
 
 #include "mboxtest.h"
 
-#include <QtCore/QDir>
-#include <QtCore/QFile>
+#include <QDir>
+#include <QFile>
 
 #include <qtest.h>
 #include <QStandardPaths>
diff -Nru kmbox-17.04.3/autotests/mboxtest.h kmbox-17.08.3/autotests/mboxtest.h
--- kmbox-17.04.3/autotests/mboxtest.h	2017-06-19 05:07:04.000000000 +0000
+++ kmbox-17.08.3/autotests/mboxtest.h	2017-10-29 07:12:36.000000000 +0000
@@ -65,7 +65,7 @@
     explicit ThreadFillsMBox(const QString &fileName);
 
 protected:
-    virtual void run() Q_DECL_OVERRIDE;
+    virtual void run() override;
 
 private:
     KMBox::MBox *mbox;
diff -Nru kmbox-17.04.3/autotests/test-entries.h kmbox-17.08.3/autotests/test-entries.h
--- kmbox-17.04.3/autotests/test-entries.h	2017-06-19 05:07:04.000000000 +0000
+++ kmbox-17.08.3/autotests/test-entries.h	2017-10-29 07:12:36.000000000 +0000
@@ -20,7 +20,7 @@
 #ifndef TEST_ENTRIES_H
 #define TEST_ENTRIES_H
 
-#include <QtCore/QByteArray>
+#include <QByteArray>
 
 const QByteArray sEntry1(
     "Return-path: <commitfilter@new.kstuff.org>\n"
diff -Nru kmbox-17.04.3/CMakeLists.txt kmbox-17.08.3/CMakeLists.txt
--- kmbox-17.04.3/CMakeLists.txt	2017-06-19 05:07:04.000000000 +0000
+++ kmbox-17.08.3/CMakeLists.txt	2017-10-29 07:12:36.000000000 +0000
@@ -1,10 +1,10 @@
 cmake_minimum_required(VERSION 3.0)
-set(PIM_VERSION "5.5.3")
+set(PIM_VERSION "5.6.3")
 
 project(KMbox VERSION ${PIM_VERSION})
 
 # ECM setup
-set(KF5_VERSION "5.32.0")
+set(KF5_VERSION "5.35.0")
 find_package(ECM ${KF5_VERSION} CONFIG REQUIRED)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
 
@@ -23,7 +23,7 @@
 
 
 set(KMBOX_LIB_VERSION ${PIM_VERSION})
-set(KMIME_LIB_VERSION "5.5.3")
+set(KMIME_LIB_VERSION "5.6.3")
 
 ecm_setup_version(PROJECT VARIABLE_PREFIX KMBOX
                         VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kmbox_version.h"
@@ -34,6 +34,9 @@
 ########### Find packages ###########
 find_package(KF5Mime ${KMIME_LIB_VERSION} CONFIG REQUIRED)
 add_definitions("-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII")
+add_definitions(-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT)
+add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000)
+add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
 
 ########### Targets ###########
 add_subdirectory(src)
diff -Nru kmbox-17.04.3/debian/changelog kmbox-17.08.3/debian/changelog
--- kmbox-17.04.3/debian/changelog	2017-08-21 13:31:43.000000000 +0000
+++ kmbox-17.08.3/debian/changelog	2017-12-01 15:07:31.000000000 +0000
@@ -1,3 +1,9 @@
+kmbox (17.08.3-0ubuntu1) bionic; urgency=medium
+
+  * New upstream release (17.08.3)
+
+ -- Rik Mills <rikmills@kubuntu.org>  Fri, 01 Dec 2017 15:07:31 +0000
+
 kmbox (17.04.3-0ubuntu1) artful; urgency=low
 
   * New upstream release (17.04.1)
diff -Nru kmbox-17.04.3/debian/control kmbox-17.08.3/debian/control
--- kmbox-17.04.3/debian/control	2017-08-21 13:31:43.000000000 +0000
+++ kmbox-17.08.3/debian/control	2017-12-01 15:07:31.000000000 +0000
@@ -8,7 +8,7 @@
                extra-cmake-modules (>= 5.31.0~),
                libboost-dev,
                libkf5kdelibs4support-dev (>= 5.31.0~),
-               libkf5mime-dev (>= 17.04.3~),
+               libkf5mime-dev (>= 17.08.3~),
                pkg-kde-tools (>> 0.15.15),
                qtbase5-dev (>= 5.6.1~)
 Standards-Version: 3.9.6
@@ -21,7 +21,7 @@
 Architecture: any
 Multi-Arch: foreign
 Depends: libkf5mbox5 (= ${binary:Version}),
-         libkf5mime-dev (>= 17.04.3~),
+         libkf5mime-dev (>= 17.08.3~),
          qtbase5-dev (>= 5.6.1~),
          ${misc:Depends}
 Description: library for handling mbox mailboxes - development files
diff -Nru kmbox-17.04.3/src/mbox.cpp kmbox-17.08.3/src/mbox.cpp
--- kmbox-17.04.3/src/mbox.cpp	2017-06-19 05:07:04.000000000 +0000
+++ kmbox-17.08.3/src/mbox.cpp	2017-10-29 07:12:36.000000000 +0000
@@ -31,25 +31,10 @@
 #include <QStandardPaths>
 #include <QUrl>
 
-#include <QtCore/QBuffer>
-#include <QtCore/QProcess>
+#include <QBuffer>
+#include <QProcess>
 
 using namespace KMBox;
-#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
 /// public methods.
 
 MBox::MBox()
@@ -359,7 +344,7 @@
         return unlock();
     }
 
-    qSort(d->mEntries.begin(), d->mEntries.end(), lessThanByOffset);
+    std::sort(d->mEntries.begin(), d->mEntries.end(), lessThanByOffset);
     quint64 writeOffset = 0;
     bool writeOffSetInitialized = false;
     MBoxEntry::List resultingEntryList;
diff -Nru kmbox-17.04.3/src/mboxentry.h kmbox-17.08.3/src/mboxentry.h
--- kmbox-17.04.3/src/mboxentry.h	2017-06-19 05:07:04.000000000 +0000
+++ kmbox-17.08.3/src/mboxentry.h	2017-10-29 07:12:36.000000000 +0000
@@ -22,10 +22,10 @@
 
 #include "kmbox_export.h"
 
-#include <QtCore/QVector>
-#include <QtCore/QMetaType>
-#include <QtCore/QPair>
-#include <QtCore/QSharedDataPointer>
+#include <QVector>
+#include <QMetaType>
+#include <QPair>
+#include <QSharedDataPointer>
 
 namespace KMBox
 {
diff -Nru kmbox-17.04.3/src/mboxentry_p.h kmbox-17.08.3/src/mboxentry_p.h
--- kmbox-17.04.3/src/mboxentry_p.h	2017-06-19 05:07:04.000000000 +0000
+++ kmbox-17.08.3/src/mboxentry_p.h	2017-10-29 07:12:36.000000000 +0000
@@ -20,7 +20,7 @@
 #ifndef KMBOX_MBOXENTRY_P_H
 #define KMBOX_MBOXENTRY_P_H
 
-#include <QtCore/QSharedData>
+#include <QSharedData>
 
 namespace KMBox
 {
diff -Nru kmbox-17.04.3/src/mbox_p.cpp kmbox-17.08.3/src/mbox_p.cpp
--- kmbox-17.04.3/src/mbox_p.cpp	2017-06-19 05:07:04.000000000 +0000
+++ kmbox-17.08.3/src/mbox_p.cpp	2017-10-29 07:12:36.000000000 +0000
@@ -153,6 +153,9 @@
                 *d++ = '>';
             }
         // fall through
+#if QT_VERSION >= QT_VERSION_CHECK(5,8,0)
+        Q_FALLTHROUGH();
+#endif
         default:
             onlyAnglesAfterLF = false;
             break;
diff -Nru kmbox-17.04.3/src/mbox_p.h kmbox-17.08.3/src/mbox_p.h
--- kmbox-17.04.3/src/mbox_p.h	2017-06-19 05:07:04.000000000 +0000
+++ kmbox-17.08.3/src/mbox_p.h	2017-10-29 07:12:36.000000000 +0000
@@ -22,9 +22,9 @@
 
 #include "mbox.h"
 
-#include <QtCore/QFile>
-#include <QtCore/QObject>
-#include <QtCore/QTimer>
+#include <QFile>
+#include <QObject>
+#include <QTimer>
 
 namespace KMBox
 {