Git commit 8b0406081fe450891c70ba1ceb6b0c42ee6784b2 by Yuri Chornoivan.
Committed on 19/09/2018 at 17:42.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues and minor porting

M  +1    -1    plugins/adblock/CMakeLists.txt
M  +1    -0    plugins/adblock/adblock.cpp
M  +11   -10   plugins/adblock/adblockdialog.cpp
M  +3    -2    plugins/adblock/adblockdialog.h
M  +1    -1    plugins/akregator/CMakeLists.txt
M  +5    -5    plugins/akregator/feeddetector.cpp
M  +1    -1    plugins/autorefresh/autorefresh.cpp
M  +5    -5    plugins/fsview/fsview.cpp
M  +6    -5    plugins/fsview/fsview_part.cpp
M  +1    -1    plugins/fsview/inode.cpp
M  +5    -4    plugins/fsview/scan.cpp
M  +9    -11   plugins/kimgalleryplugin/imgallerydialog.cpp
M  +9    -8    plugins/kimgalleryplugin/imgalleryplugin.cpp
M  +2    -2    plugins/microformat/pluginbase.cpp
M  +3    -4    plugins/minitools/minitoolsplugin.cpp
M  +5    -5    plugins/rellinks/plugin_rellinks.cpp
M  +3    -2    plugins/uachanger/uachangerplugin.cpp
M  +4    -3    plugins/webarchiver/archivedialog.cpp
M  +2    -1    plugins/webarchiver/plugin_webarchiver.cpp
M  +2    -2    settings/konqhtml/appearance.cpp
M  +1    -1    sidebar/test/konqsidebartest.cpp
M  +3    -1    src/KonqMainWindowAdaptor.h
M  +1    -1    src/KonqViewAdaptor.h
M  +2    -1    src/KonquerorAdaptor.h
M  +0    -1    src/konqcloseditem.h
M  +1    -0    src/konqhistoryproxymodel.cpp
M  +2    -1    src/konqhistorysettings.h
M  +2    -0    src/konqhistoryview.cpp
M  +2    -0    src/konqview.cpp
M  +3    -1    webenginepart/autotests/webengine_testutils.h
M  +3    -3    webenginepart/src/settings/webengine_filter.h
M  +1    -1    webenginepart/src/settings/webenginesettings.cpp
M  +1    -1    webenginepart/src/ui/featurepermissionbar.h
M  +1    -1    webenginepart/src/webenginepage.h
M  +1    -1    webenginepart/src/webenginepart.h
M  +2    -2    webenginepart/src/webenginepart_ext.cpp

https://commits.kde.org/konqueror/8b0406081fe450891c70ba1ceb6b0c42ee6784b2

diff --git a/plugins/adblock/CMakeLists.txt b/plugins/adblock/CMakeLists.txt
index e0dc37dfd..7540168ed 100644
--- a/plugins/adblock/CMakeLists.txt
+++ b/plugins/adblock/CMakeLists.txt
@@ -8,7 +8,7 @@ add_library(adblock MODULE ${adblock_PART_SRCS})
 =

 =

 =

-target_link_libraries(adblock  KF5::Parts KF5::KHtml KF5::KCMUtils)
+target_link_libraries(adblock  KF5::Parts KF5::KHtml KF5::KCMUtils KF5::KD=
ELibs4Support)
 =

 install(TARGETS adblock  DESTINATION ${KDE_INSTALL_PLUGINDIR} )
 =

diff --git a/plugins/adblock/adblock.cpp b/plugins/adblock/adblock.cpp
index c98c4a6e2..2fc50980c 100644
--- a/plugins/adblock/adblock.cpp
+++ b/plugins/adblock/adblock.cpp
@@ -40,6 +40,7 @@
 #include <KActionCollection>
 #include <KActionMenu>
 #include <KMenu>
+#include <KIcon>
 #include <dom/html_document.h>
 #include <dom/html_image.h>
 #include <dom/html_inline.h>
diff --git a/plugins/adblock/adblockdialog.cpp b/plugins/adblock/adblockdia=
log.cpp
index 2b23c4f29..74e771137 100644
--- a/plugins/adblock/adblockdialog.cpp
+++ b/plugins/adblock/adblockdialog.cpp
@@ -17,22 +17,23 @@
   Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 =

-#include "adblock.h"
 #include "adblockdialog.h"
+#include "adblock.h"
 =

-#include <kdebug.h>
-#include <kmenu.h>
-#include <klocale.h>
+#include <KDebug>
+#include <KMenu>
+#include <KLocalizedString>
+#include <KIcon>
 #include <KTreeWidgetSearchLine>
 #include <KRun>
 #include <KStandardGuiItem>
 =

-#include <qcursor.h>
-#include <qlabel.h>
-#include <qlineedit.h>
-#include <qcolor.h>
-#include <qfont.h>
-#include <qpainter.h>
+#include <QCursor>
+#include <QLabel>
+#include <QLineEdit>
+#include <QColor>
+#include <QFont>
+#include <QPainter>
 #include <QTreeWidget>
 #include <QApplication>
 #include <QClipboard>
diff --git a/plugins/adblock/adblockdialog.h b/plugins/adblock/adblockdialo=
g.h
index e8d0c1bf4..464eb6c45 100644
--- a/plugins/adblock/adblockdialog.h
+++ b/plugins/adblock/adblockdialog.h
@@ -17,9 +17,10 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-130=
1, USA.
 */
 =

-#ifndef KONQ_ADBLOCKDLG_H
-#define KONQ_ADBLOCKDLG_H
+#ifndef KONQ_ADBLOCKDIALOG_H
+#define KONQ_ADBLOCKDIALOG_H
 =

+#include "adblock.h"
 #include <kdialog.h>
 #include <QTreeWidgetItem>
 #include <khtml_part.h>
diff --git a/plugins/akregator/CMakeLists.txt b/plugins/akregator/CMakeList=
s.txt
index 0734e5fa0..a80ca89c2 100644
--- a/plugins/akregator/CMakeLists.txt
+++ b/plugins/akregator/CMakeLists.txt
@@ -9,7 +9,7 @@ kcoreaddons_add_plugin(akregatorplugin SOURCES ${akregatorp=
lugin_PART_SRCS} ${ak
 kcoreaddons_desktop_to_json(akregatorplugin akregator_konqplugin.desktop)
 =

 target_compile_definitions(akregatorplugin PRIVATE TRANSLATION_DOMAIN=3D"a=
kregator_konqplugin")
-target_link_libraries(akregatorplugin KF5::I18n KF5::KIOWidgets)
+target_link_libraries(akregatorplugin KF5::I18n KF5::KIOWidgets Qt5::DBus)
 =

 ########### next target ###############
 =

diff --git a/plugins/akregator/feeddetector.cpp b/plugins/akregator/feeddet=
ector.cpp
index 1e9742fff..b4f1bceea 100644
--- a/plugins/akregator/feeddetector.cpp
+++ b/plugins/akregator/feeddetector.cpp
@@ -22,13 +22,13 @@
     without including the source code for Qt in the source distribution.
 */
 =

-#include <qregexp.h>
-#include <qstring.h>
-#include <qstringlist.h>
+#include "feeddetector.h"
+#include <QRegExp>
+#include <QString>
+#include <QStringList>
 =

-#include <kcharsets.h>
+#include <KCharsets>
 =

-#include "feeddetector.h"
 #include "akregatorplugindebug.h"
 =

 using namespace Akregator;
diff --git a/plugins/autorefresh/autorefresh.cpp b/plugins/autorefresh/auto=
refresh.cpp
index dd96ca542..96a162af6 100644
--- a/plugins/autorefresh/autorefresh.cpp
+++ b/plugins/autorefresh/autorefresh.cpp
@@ -19,8 +19,8 @@
   02110-1301, USA.
  */
 =

-#include <kparts/part.h>
 #include "autorefresh.h"
+#include <kparts/part.h>
 =

 #include <kcomponentdata.h>
 #include <kiconloader.h>
diff --git a/plugins/fsview/fsview.cpp b/plugins/fsview/fsview.cpp
index e2552064e..3e38c1975 100644
--- a/plugins/fsview/fsview.cpp
+++ b/plugins/fsview/fsview.cpp
@@ -17,11 +17,13 @@
 */
 =

 /*
- * FSView specialisaton of TreeMap classes.
+ * FSView specialization of TreeMap classes.
  */
 =

-#include <qdir.h>
-#include <qtimer.h>
+#include "fsview.h"
+
+#include <QDir>
+#include <QTimer>
 #include <QApplication>
 =

 #include <KLocalizedString>
@@ -34,8 +36,6 @@
 #include <kconfiggroup.h>
 #include <kurlauthorized.h>
 =

-#include "fsview.h"
-
 // FSView
 =

 QMap<QString, MetricEntry> FSView::_dirMetric;
diff --git a/plugins/fsview/fsview_part.cpp b/plugins/fsview/fsview_part.cpp
index ff584fd32..2b017aca7 100644
--- a/plugins/fsview/fsview_part.cpp
+++ b/plugins/fsview/fsview_part.cpp
@@ -22,8 +22,11 @@
  * The KPart embedding the FSView widget
  */
 =

-#include <qclipboard.h>
-#include <qtimer.h>
+#include "fsview_part.h"
+
+#include <QClipboard>
+#include <QTimer>
+#include <QStyle>
 =

 #include <kfileitem.h>
 #include <kpluginfactory.h>
@@ -51,8 +54,6 @@
 #include <QApplication>
 #include <QMimeData>
 =

-#include "fsview_part.h"
-
 K_PLUGIN_FACTORY(FSViewPartFactory, registerPlugin<FSViewPart>();)
 K_EXPORT_PLUGIN(FSViewPartFactory(KAboutData(
                                       "fsview",
@@ -229,7 +230,7 @@ void FSViewPart::slotSettingsChanged(int category)
     QObject::disconnect(_view, SIGNAL(doubleClicked(TreeMapItem*)),
                         _ext, SLOT(selected(TreeMapItem*)));
 =

-    if (KGlobalSettings::singleClick())
+    if (_view->style()->styleHint(QStyle::SH_ItemView_ActivateItemOnSingle=
Click))
         QObject::connect(_view, SIGNAL(clicked(TreeMapItem*)),
                          _ext, SLOT(selected(TreeMapItem*)));
     else
diff --git a/plugins/fsview/inode.cpp b/plugins/fsview/inode.cpp
index 5fa39cc8f..ab2efe4dd 100644
--- a/plugins/fsview/inode.cpp
+++ b/plugins/fsview/inode.cpp
@@ -20,13 +20,13 @@
  * FSView specialisaton of TreeMapItem class.
  */
 =

+#include "inode.h"
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <KLocalizedString>
 #include <QMimeDatabase>
 #include <QMimeType>
-#include "inode.h"
 #include "scan.h"
 #include "fsview.h"
 =

diff --git a/plugins/fsview/scan.cpp b/plugins/fsview/scan.cpp
index 700cfe882..f654ae5a9 100644
--- a/plugins/fsview/scan.cpp
+++ b/plugins/fsview/scan.cpp
@@ -16,16 +16,17 @@
    Boston, MA 02110-1301, USA.
 */
 =

-#include <qdir.h>
-#include <qstringlist.h>
-#include <qset.h>
+#include "scan.h"
+
+#include <QDir>
+#include <QStringList>
+#include <QSet>
 #include <qplatformdefs.h>
 =

 #include <kdebug.h>
 #include <kauthorized.h>
 #include <kurlauthorized.h>
 =

-#include "scan.h"
 #include "inode.h"
 =

 // ScanManager
diff --git a/plugins/kimgalleryplugin/imgallerydialog.cpp b/plugins/kimgall=
eryplugin/imgallerydialog.cpp
index 872a4b65b..16a49476a 100644
--- a/plugins/kimgalleryplugin/imgallerydialog.cpp
+++ b/plugins/kimgalleryplugin/imgallerydialog.cpp
@@ -18,18 +18,19 @@ the Free Software Foundation, Inc., 51 Franklin Street,=
 Fifth Floor,
 Boston, MA 02110-1301, USA.
 */
 =

-#include <qlabel.h>
-#include <qlayout.h>
-#include <qcombobox.h>
-
-#include <qcheckbox.h>
-#include <qlineedit.h>
-#include <qspinbox.h>
-//Added by qt3to4:
+#include "imgallerydialog.h"
+
+#include <QLabel>
+#include <QLayout>
+#include <QComboBox>
+#include <QCheckBox>
+#include <QLineEdit>
+#include <QSpinBox>
 #include <QVBoxLayout>
 #include <QFrame>
 #include <QHBoxLayout>
 #include <QGridLayout>
+#include <QFontDatabase>
 =

 #include <KLocalizedString>
 #include <kfontdialog.h>
@@ -40,9 +41,6 @@ Boston, MA 02110-1301, USA.
 #include <kurlrequester.h>
 #include <kconfig.h>
 =

-#include <QFontDatabase>
-#include "imgallerydialog.h"
-
 KIGPDialog::KIGPDialog(QWidget *parent, const QString &path)
     : KPageDialog(parent)
 {
diff --git a/plugins/kimgalleryplugin/imgalleryplugin.cpp b/plugins/kimgall=
eryplugin/imgalleryplugin.cpp
index 0d3244535..e9e311e10 100644
--- a/plugins/kimgalleryplugin/imgalleryplugin.cpp
+++ b/plugins/kimgalleryplugin/imgalleryplugin.cpp
@@ -18,13 +18,15 @@ the Free Software Foundation, Inc., 51 Franklin Street,=
 Fifth Floor,
 Boston, MA 02110-1301, USA.
 */
 =

-#include <qdir.h>
-#include <qtextstream.h>
-#include <qfile.h>
-#include <qdatetime.h>
-#include <qpixmap.h>
-#include <qimage.h>
-#include <qtextcodec.h>
+#include "imgalleryplugin.h"
+
+#include <QDir>
+#include <QTextStream>
+#include <QFile>
+#include <QDateTime>
+#include <QPixmap>
+#include <QImage>
+#include <QTextCodec>
 #include <QApplication>
 =

 =

@@ -45,7 +47,6 @@ Boston, MA 02110-1301, USA.
 #include <kparts/part.h>
 =

 #include "imgallerydialog.h"
-#include "imgalleryplugin.h"
 =

 //KDELibs4Support
 #include <kdeversion.h>
diff --git a/plugins/microformat/pluginbase.cpp b/plugins/microformat/plugi=
nbase.cpp
index b5bbda0ff..d71c6ba45 100644
--- a/plugins/microformat/pluginbase.cpp
+++ b/plugins/microformat/pluginbase.cpp
@@ -20,11 +20,11 @@
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
+#include "pluginbase.h"
+
 #include <QDBusInterface>
 #include <klocale.h>
 =

-#include "pluginbase.h"
-
 #include <kdebug.h>
 =

 PluginBase::PluginBase()
diff --git a/plugins/minitools/minitoolsplugin.cpp b/plugins/minitools/mini=
toolsplugin.cpp
index 2f15575e1..de864dc1e 100644
--- a/plugins/minitools/minitoolsplugin.cpp
+++ b/plugins/minitools/minitoolsplugin.cpp
@@ -18,10 +18,11 @@
     Boston, MA 02110-1301, USA.
 */
 =

-#include <qfile.h>
-
+#include "minitoolsplugin.h"
 #include "minitoolsplugindebug.h"
 =

+#include <QFile>
+
 #include <kglobal.h>
 #include <kconfig.h>
 #include <kcomponentdata.h>
@@ -30,14 +31,12 @@
 =

 #include <kstandarddirs.h>
 =

-#include <krun.h>
 #include <kservice.h>
 #include <kactionmenu.h>
 #include <QMenu>
 #include <kbookmarkimporter.h>
 #include <kbookmarkmanager.h>
 #include <kactioncollection.h>
-#include "minitoolsplugin.h"
 =

 K_PLUGIN_FACTORY(MinitoolsPluginFactory, registerPlugin<MinitoolsPlugin>()=
;)
 =

diff --git a/plugins/rellinks/plugin_rellinks.cpp b/plugins/rellinks/plugin=
_rellinks.cpp
index 639492b02..e9e1456e4 100644
--- a/plugins/rellinks/plugin_rellinks.cpp
+++ b/plugins/rellinks/plugin_rellinks.cpp
@@ -20,9 +20,12 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.        =
     *
  *************************************************************************=
**/
 =

+// local includes
+#include "plugin_rellinks.h"
+
 // Qt includes
-#include <qapplication.h>
-#include <qtimer.h>
+#include <QApplication>
+#include <QTimer>
 #include <QKeySequence>
 #include <QActionGroup>
 =

@@ -43,9 +46,6 @@
 #include <ktoolbar.h>
 #include <kactionmenu.h>
 #include <kactioncollection.h>
-// local includes
-#include "plugin_rellinks.h"
-
 =

 /** Rellinks factory */
 K_PLUGIN_FACTORY(RelLinksFactory, registerPlugin<RelLinksPlugin>();)
diff --git a/plugins/uachanger/uachangerplugin.cpp b/plugins/uachanger/uach=
angerplugin.cpp
index 7aa7cdf14..705e8cd55 100644
--- a/plugins/uachanger/uachangerplugin.cpp
+++ b/plugins/uachanger/uachangerplugin.cpp
@@ -18,9 +18,11 @@
     Boston, MA 02110-1301, USA.
 */
 =

+#include "uachangerplugin.h"
+
 #include <sys/utsname.h>
 =

-#include <qregexp.h>
+#include <QRegExp>
 #include <QDBusConnection>
 #include <QDBusMessage>
 #include <kicon.h>
@@ -43,7 +45,6 @@
 #include <kprotocolmanager.h>
 #include <kaboutdata.h>
 #include <kactioncollection.h>
-#include "uachangerplugin.h"
 =

 static const KAboutData aboutdata("uachangerplugin", 0, ki18n("Change Brow=
ser Identification"), "1.0");
 K_PLUGIN_FACTORY(UAChangerPluginFactory, registerPlugin<UAChangerPlugin>()=
;)
diff --git a/plugins/webarchiver/archivedialog.cpp b/plugins/webarchiver/ar=
chivedialog.cpp
index 4a734445b..ee05dfcc8 100644
--- a/plugins/webarchiver/archivedialog.cpp
+++ b/plugins/webarchiver/archivedialog.cpp
@@ -49,10 +49,12 @@
 // TODO KDE4 check what KHTMLPart is doing on job->addMetaData()
 // TODO KDE4 use HTMLScriptElementImpl::charset() to get charset=3D"" attr=
ibute of <link> elements
 =

+#include "archivedialog.h"
+
 #include <cassert>
 =

-#include <qtextcodec.h>
-#include <qtextdocument.h>
+#include <QTextCodec>
+#include <QTextDocument>
 =

 #include <ktar.h>
 #include <kauthorized.h>
@@ -71,7 +73,6 @@
 #include <dom/css_stylesheet.h>
 #include <dom/css_value.h>
 =

-#include "archivedialog.h"
 #include "webarchiverdebug.h"
 =

 //KDELibs4Support
diff --git a/plugins/webarchiver/plugin_webarchiver.cpp b/plugins/webarchiv=
er/plugin_webarchiver.cpp
index 3446fb75c..78901d03e 100644
--- a/plugins/webarchiver/plugin_webarchiver.cpp
+++ b/plugins/webarchiver/plugin_webarchiver.cpp
@@ -29,6 +29,8 @@
 =

 //#define DEBUG_WAR
 =

+#include "plugin_webarchiver.h"
+
 #include <QDir>
 #include <QFile>
 #include <QIcon>
@@ -46,7 +48,6 @@
 #include <kactioncollection.h>
 #include <kstandardguiitem.h>
 #include <QStandardPaths>
-#include "plugin_webarchiver.h"
 #include "archivedialog.h"
 =

 K_PLUGIN_FACTORY(PluginWebArchiverFactory, registerPlugin<PluginWebArchive=
r>();)
diff --git a/settings/konqhtml/appearance.cpp b/settings/konqhtml/appearanc=
e.cpp
index 2a8349fbb..e7eee2311 100644
--- a/settings/konqhtml/appearance.cpp
+++ b/settings/konqhtml/appearance.cpp
@@ -1,3 +1,5 @@
+#include "appearance.h"
+
 #include "kcmcss.h"
 =

 #include <QFormLayout>
@@ -20,8 +22,6 @@
 #include <QFontDatabase>
 #include <QSpinBox>
 =

-#include "appearance.h"
-
 static const char *const animationValues[] =3D {"Enabled", "Disabled", "Lo=
opOnce"};
 enum AnimationsType { AnimationsAlways =3D 0, AnimationsNever =3D 1, Anima=
tionsLoopOnce =3D 2 };
 =

diff --git a/sidebar/test/konqsidebartest.cpp b/sidebar/test/konqsidebartes=
t.cpp
index ff176dddf..eaa9c2d96 100644
--- a/sidebar/test/konqsidebartest.cpp
+++ b/sidebar/test/konqsidebartest.cpp
@@ -14,8 +14,8 @@
  *   (at your option) any later version.                                  =
 *
  *                                                                        =
 *
  *************************************************************************=
**/
-#include <kcomponentdata.h>
 #include "konqsidebartest.h"
+#include <kcomponentdata.h>
 =

 extern "C"
 {
diff --git a/src/KonqMainWindowAdaptor.h b/src/KonqMainWindowAdaptor.h
index 206a6bddb..e06788ad1 100644
--- a/src/KonqMainWindowAdaptor.h
+++ b/src/KonqMainWindowAdaptor.h
@@ -25,7 +25,9 @@
 // Use qdbuscpp2xml KonqMainWindowAdaptor.h > org.kde.Konqueror.MainWindow=
.xml
 // if you change the API.
 =

-#include <QtDBus>
+#include <QDBusAbstractAdaptor>
+#include <QDBusObjectPath>
+#include <QDBusConnection>
 =

 class KonqMainWindow;
 =

diff --git a/src/KonqViewAdaptor.h b/src/KonqViewAdaptor.h
index e07f6e773..4c8b6649d 100644
--- a/src/KonqViewAdaptor.h
+++ b/src/KonqViewAdaptor.h
@@ -22,7 +22,7 @@
 #define __KonqViewAdaptor_h__
 =

 #include <QStringList>
-#include <QtDBus>
+#include <QDBusObjectPath>
 =

 class KonqView;
 =

diff --git a/src/KonquerorAdaptor.h b/src/KonquerorAdaptor.h
index 2b6dee49b..eec1cd232 100644
--- a/src/KonquerorAdaptor.h
+++ b/src/KonquerorAdaptor.h
@@ -22,7 +22,8 @@
 #define KONQUERORADAPTOR_H
 =

 #include <QStringList>
-#include <QtDBus>
+#include <QDBusObjectPath>
+#include <QDBusMessage>
 =

 #define KONQ_MAIN_PATH "/KonqMain"
 =

diff --git a/src/konqcloseditem.h b/src/konqcloseditem.h
index 47da48a99..196073987 100644
--- a/src/konqcloseditem.h
+++ b/src/konqcloseditem.h
@@ -23,7 +23,6 @@
 =

 #include "konqprivate_export.h"
 #include <kconfiggroup.h>
-#include <QtDBus>
 #include <QString>
 =

 class KConfig;
diff --git a/src/konqhistoryproxymodel.cpp b/src/konqhistoryproxymodel.cpp
index 951e68f53..acc10cb87 100644
--- a/src/konqhistoryproxymodel.cpp
+++ b/src/konqhistoryproxymodel.cpp
@@ -21,6 +21,7 @@
 =

 #include "konqhistory.h"
 #include "konqhistorysettings.h"
+#include <QDateTime>
 =

 KonqHistoryProxyModel::KonqHistoryProxyModel(KonqHistorySettings *settings=
, QObject *parent)
     : KSortFilterProxyModel(parent)
diff --git a/src/konqhistorysettings.h b/src/konqhistorysettings.h
index e856fda5b..d0e7ff0a6 100644
--- a/src/konqhistorysettings.h
+++ b/src/konqhistorysettings.h
@@ -22,7 +22,8 @@
 =

 #include <QFont>
 #include <QObject>
-#include <QtDBus>
+#include <QDBusAbstractAdaptor>
+#include <QDBusConnection>
 =

 /**
  * Object containing the settings used by the history views
diff --git a/src/konqhistoryview.cpp b/src/konqhistoryview.cpp
index f9f30cfd2..088595e31 100644
--- a/src/konqhistoryview.cpp
+++ b/src/konqhistoryview.cpp
@@ -28,6 +28,8 @@
 #include <QClipboard>
 #include <QApplication>
 #include <QMenu>
+#include <QMimeData>
+#include <QTimer>
 #include <QTreeView>
 #include <QVBoxLayout>
 =

diff --git a/src/konqview.cpp b/src/konqview.cpp
index 316664bb8..8e5e569c9 100644
--- a/src/konqview.cpp
+++ b/src/konqview.cpp
@@ -50,6 +50,8 @@
 #include <QEvent>
 #include <QFile>
 #include <QDropEvent>
+#include <QDBusConnection>
+#include <QMimeData>
 #ifdef KActivities_FOUND
 #endif
 =

diff --git a/webenginepart/autotests/webengine_testutils.h b/webenginepart/=
autotests/webengine_testutils.h
index 37489847b..6eecb9077 100644
--- a/webenginepart/autotests/webengine_testutils.h
+++ b/webenginepart/autotests/webengine_testutils.h
@@ -25,6 +25,8 @@
   ** $QT_END_LICENSE$
   **
   ************************************************************************=
****/
+#ifndef WEBENGINE_TESTUTILS_H
+#define WEBENGINE_TESTUTILS_H
 =

 #include <QEventLoop>
 #include <QTimer>
@@ -105,4 +107,4 @@ static QPoint elementCenter(QWebEnginePage *page, const=
 QString &id)
                      rectList.at(2).toInt(), rectList.at(3).toInt());
     return rect.center();
 }
-
+#endif
diff --git a/webenginepart/src/settings/webengine_filter.h b/webenginepart/=
src/settings/webengine_filter.h
index 2c908a478..38e6d9843 100644
--- a/webenginepart/src/settings/webengine_filter.h
+++ b/webenginepart/src/settings/webengine_filter.h
@@ -20,8 +20,8 @@
    Boston, MA 02110-1301, USA.
 */
 =

-#ifndef WEBENGNINE_FILTER_P_H
-#define WEBENGNINE_FILTER_P_H
+#ifndef WEBENGNINE_FILTER_H
+#define WEBENGNINE_FILTER_H
 =

 #include <QString>
 #include <QRegExp>
@@ -55,6 +55,6 @@ private:
 =

 }
 =

-#endif // WEBENGINE_FILTER_P_H
+#endif // WEBENGINE_FILTER_H
 =

 // kate: indent-width 4; replace-tabs on; tab-width 4; space-indent on;
diff --git a/webenginepart/src/settings/webenginesettings.cpp b/webenginepa=
rt/src/settings/webenginesettings.cpp
index a0e34158e..fe07785e9 100644
--- a/webenginepart/src/settings/webenginesettings.cpp
+++ b/webenginepart/src/settings/webenginesettings.cpp
@@ -29,7 +29,7 @@
 #include <KIO/Job>
 #include <KMessageBox>
 =

-#include <QtWebEngineWidgets/QWebEngineSettings>
+#include <QWebEngineSettings>
 #include <QFontDatabase>
 #include <QFileInfo>
 =

diff --git a/webenginepart/src/ui/featurepermissionbar.h b/webenginepart/sr=
c/ui/featurepermissionbar.h
index d988ad36f..c348f5d10 100644
--- a/webenginepart/src/ui/featurepermissionbar.h
+++ b/webenginepart/src/ui/featurepermissionbar.h
@@ -24,7 +24,7 @@
 =

 #include <KMessageWidget>
 =

-#include <QtWebEngineWidgets/QWebEnginePage>
+#include <QWebEnginePage>
 =

 =

 class FeaturePermissionBar : public KMessageWidget
diff --git a/webenginepart/src/webenginepage.h b/webenginepart/src/webengin=
epage.h
index cb3d5ed71..98741f6a2 100644
--- a/webenginepart/src/webenginepage.h
+++ b/webenginepart/src/webenginepage.h
@@ -26,7 +26,7 @@
 #include "websslinfo.h"
 =

 #include <KParts/BrowserExtension>
-#include <QtWebEngineWidgets/QWebEnginePage>
+#include <QWebEnginePage>
 =

 #include <QUrl>
 #include <QDebug>
diff --git a/webenginepart/src/webenginepart.h b/webenginepart/src/webengin=
epart.h
index aa750dcd5..024312925 100644
--- a/webenginepart/src/webenginepart.h
+++ b/webenginepart/src/webenginepart.h
@@ -24,7 +24,7 @@
 =

 #include "kwebenginepartlib_export.h"
 =

-#include <QtWebEngineWidgets/QWebEnginePage>
+#include <QWebEnginePage>
 =

 #include <KParts/ReadOnlyPart>
 #include <QUrl>
diff --git a/webenginepart/src/webenginepart_ext.cpp b/webenginepart/src/we=
benginepart_ext.cpp
index 44bd3f9ea..b3c63b10a 100644
--- a/webenginepart/src/webenginepart_ext.cpp
+++ b/webenginepart/src/webenginepart_ext.cpp
@@ -18,14 +18,14 @@
  *
  */
 =

-#include <QtWebEngine/QtWebEngineVersion>
 #include "webenginepart_ext.h"
+#include <QtWebEngine/QtWebEngineVersion>
 =

 #include "webenginepart.h"
 #include "webengineview.h"
 #include "webenginepage.h"
 #include "settings/webenginesettings.h"
-#include <QtWebEngineWidgets/QWebEngineSettings>
+#include <QWebEngineSettings>
 =

 #include <KDesktopFile>
 #include <KConfigGroup>