Merge remote-tracking branch 'origin/Applications/17.12'

src/configuredialog/configureaccountpage.cpp

@@ -38,18 +38,19 @@ using MailTransport::TransportManagementWidget;
 #include <AkonadiCore/agentinstancecreatejob.h>
 #include <identity/identitypage.h>
 
+#include <KComboBox>
+#include <KConfigGroup>
 #include <KLocalizedString>
 #include <KMessageBox>
-#include <KComboBox>
 #include "kmail_debug.h"
 
-#include <QVBoxLayout>
+#include <QAbstractItemView>
 #include <QGridLayout>
 #include <QGroupBox>
 #include <QMenu>
-#include <KConfigGroup>
 #include <QLabel>
 #include <QProcess>
+#include <QVBoxLayout>
 
 QString AccountsPage::helpAnchor() const
 {

src/configuredialog/configuresecuritypage.cpp

@@ -34,10 +34,12 @@ using namespace PimCommon::ConfigureImmutableWidgetUtils;
 #include <KLocalizedString>
 #include <KCMultiDialog>
 #include <KMessageBox>
-#include <QWhatsThis>
-#include <QDBusConnection>
 #include "kmail_debug.h"
 
+#include <QButtonGroup>
+#include <QDBusConnection>
+#include <QWhatsThis>
+
 QString SecurityPage::helpAnchor() const
 {
     return QStringLiteral("configure-security");