From 05fcc3565800425d9dc1feb001839a77dc52753d Mon Sep 17 00:00:00 2001
From: David Rosca <nowrep@gmail.com>
Date: Fri, 22 May 2015 18:14:16 +0200
Subject: [PATCH] Fix build with Qt 5.5

Also enable plugins: FlashCookieManager, Gnome and KWallet passwords.
---
 QupZilla.pro                                    |  2 +-
 .../qtsingleapplication/qtlocalpeer.cpp         |  1 +
 src/plugins.pri                                 |  6 +-----
 src/plugins/TabManager/tabmanagerplugin.h       |  1 -
 src/plugins/TestPlugin/testplugin.h             |  1 -
 src/plugins/plugins.pro                         | 17 +++++++++++++++--
 6 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/QupZilla.pro b/QupZilla.pro
index 0def652db..1cee50837 100644
--- a/QupZilla.pro
+++ b/QupZilla.pro
@@ -24,4 +24,4 @@ src_main.depends = sub-src-lib
 src_plugins.subdir = src/plugins
 src_plugins.depends = sub-src-lib
 
-SUBDIRS += src_lib src_main
+SUBDIRS += src_lib src_main src_plugins
diff --git a/src/lib/3rdparty/qtsingleapplication/qtlocalpeer.cpp b/src/lib/3rdparty/qtsingleapplication/qtlocalpeer.cpp
index 836658d7f..56260257e 100644
--- a/src/lib/3rdparty/qtsingleapplication/qtlocalpeer.cpp
+++ b/src/lib/3rdparty/qtsingleapplication/qtlocalpeer.cpp
@@ -48,6 +48,7 @@
 #include "qtlocalpeer.h"
 #include <QtCore/QCoreApplication>
 #include <QtCore/QTime>
+#include <QtCore/QDataStream>
 
 #if defined(Q_OS_WIN)
 #include <QtCore/QLibrary>
diff --git a/src/plugins.pri b/src/plugins.pri
index d7e9f4c3d..7dd7c8c8b 100644
--- a/src/plugins.pri
+++ b/src/plugins.pri
@@ -33,11 +33,7 @@ TEMPLATE = lib
 CONFIG += plugin
 DESTDIR = $$QZ_DESTDIR/plugins/
 
-isEqual(QT_MAJOR_VERSION, 5) {
-    QT *= webkitwidgets network
-} else {
-    QT *= webkit network
-}
+QT *= webenginewidgets network
 
 OBJECTS_DIR = build
 MOC_DIR = build
diff --git a/src/plugins/TabManager/tabmanagerplugin.h b/src/plugins/TabManager/tabmanagerplugin.h
index 680ea7095..2dcc480e3 100644
--- a/src/plugins/TabManager/tabmanagerplugin.h
+++ b/src/plugins/TabManager/tabmanagerplugin.h
@@ -25,7 +25,6 @@
 #include <QDebug>
 #include <QLabel>
 #include <QMessageBox>
-#include <QWebElement>
 #include <QVBoxLayout>
 #include <QPointer>
 
diff --git a/src/plugins/TestPlugin/testplugin.h b/src/plugins/TestPlugin/testplugin.h
index 9f4883d65..a82f72431 100644
--- a/src/plugins/TestPlugin/testplugin.h
+++ b/src/plugins/TestPlugin/testplugin.h
@@ -28,7 +28,6 @@
 
 #include <QLabel>
 #include <QMessageBox>
-#include <QWebElement>
 #include <QVBoxLayout>
 #include <QPointer>
 
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index 732682742..46bfe9248 100644
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -26,8 +26,8 @@ defineTest(disablePlugin) {
 
 addSubdir($$PWD)
 
-outOfDirPlugins = $$(QUPZILLA_PLUGINS_SRCDIR)
-!equals(outOfDirPlugins, ""): addSubdir($$(QUPZILLA_PLUGINS_SRCDIR))
+#outOfDirPlugins = $$(QUPZILLA_PLUGINS_SRCDIR)
+#!equals(outOfDirPlugins, ""): addSubdir($$(QUPZILLA_PLUGINS_SRCDIR))
 
 # TestPlugin only in debug build
 !CONFIG(debug, debug|release): disablePlugin(TestPlugin)
@@ -39,3 +39,16 @@ isEqual(QT_MAJOR_VERSION, 5): !qtHaveModule(KWallet): disablePlugin(KWalletPassw
 # GnomeKeyringPasswords only with GNOME_INTEGRATION and gnome-keyring pkg-config
 !contains(DEFINES, GNOME_INTEGRATION): disablePlugin(GnomeKeyringPasswords)
 !system(pkg-config --exists gnome-keyring-1): disablePlugin(GnomeKeyringPasswords)
+
+# QtWebEngine disable
+disablePlugin(AccessKeysNavigation)
+disablePlugin(AutoScroll)
+disablePlugin(CopyTitle)
+disablePlugin(GreaseMonkey)
+disablePlugin(MailHandle)
+disablePlugin(MouseGestures)
+disablePlugin(PIM)
+disablePlugin(StatusBarIcons)
+disablePlugin(TabManager)
+disablePlugin(TestPlugin)
+disablePlugin(Videoner)