Move custom URL scheme handlers to core

Makes the custom URL scheme handler API public, and moves it to core
so that it may be shared with the QQuickWebEngine API.

Change-Id: I745cb088df6f4cd11b1ac7c8c3c76f112032cb38
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>

9 files changed, 61 insertions, 515 deletions

diff --git a/src/webenginewidgets/api/qwebengineprofile.cpp b/src/webenginewidgets/api/qwebengineprofile.cpp
index db8c0dc89..a38a78cf7 100644
--- a/src/webenginewidgets/api/qwebengineprofile.cpp
+++ b/src/webenginewidgets/api/qwebengineprofile.cpp
@@ -42,7 +42,7 @@
 #include "qwebenginepage.h"
 #include "qwebengineprofile_p.h"
 #include "qwebenginesettings.h"
-#include "qwebengineurlschemehandler_p_p.h"
+#include "qwebengineurlschemehandler_p.h"
 #include "qwebenginescriptcollection_p.h"
 
 #include "browser_context_adapter.h"
@@ -536,10 +536,16 @@ QWebEngineSettings *QWebEngineProfile::settings() const
     return d->settings();
 }
 
-QWebEngineUrlSchemeHandler *QWebEngineProfilePrivate::urlSchemeHandler(const QByteArray &protocol)
+/*!
+    \since 5.6
+
+    Returns the custom URL scheme handler register for the URL scheme \a scheme.
+*/
+const QWebEngineUrlSchemeHandler *QWebEngineProfile::urlSchemeHandler(const QByteArray &scheme) const
 {
-    if (m_urlSchemeHandlers.contains(protocol))
-        return m_urlSchemeHandlers.value(protocol);
+    const Q_D(QWebEngineProfile);
+    if (d->m_urlSchemeHandlers.contains(scheme))
+        return d->m_urlSchemeHandlers.value(scheme);
     return 0;
 }
 
@@ -553,8 +559,14 @@ static bool checkInternalScheme(const QByteArray &scheme)
     return internalSchemes.contains(scheme);
 }
 
-void QWebEngineProfilePrivate::installUrlSchemeHandler(QWebEngineUrlSchemeHandler *handler)
+/*!
+    \since 5.6
+
+    Installs the custom URL scheme handler \a handler in the profile.
+*/
+void QWebEngineProfile::installUrlSchemeHandler(QWebEngineUrlSchemeHandler *handler)
 {
+    Q_D(QWebEngineProfile);
     Q_ASSERT(handler);
     QByteArray scheme = handler->scheme();
     if (checkInternalScheme(scheme)) {
@@ -562,29 +574,51 @@ void QWebEngineProfilePrivate::installUrlSchemeHandler(QWebEngineUrlSchemeHandle
         return;
     }
 
-    if (m_urlSchemeHandlers.contains(scheme)) {
+    if (d->m_urlSchemeHandlers.contains(scheme)) {
         qWarning() << "URL scheme handler already installed for the scheme: " << scheme;
         return;
     }
-    m_urlSchemeHandlers.insert(scheme, handler);
-    browserContext()->customUrlSchemeHandlers().append(handler->d_func());
-    browserContext()->updateCustomUrlSchemeHandlers();
+    d->m_urlSchemeHandlers.insert(scheme, handler);
+    d->browserContext()->customUrlSchemeHandlers().append(handler->d_func());
+    d->browserContext()->updateCustomUrlSchemeHandlers();
+    connect(handler, SIGNAL(destroyed(QObject*)), this, SLOT(destroyedUrlSchemeHandler(QObject*)));
 }
 
-void QWebEngineProfilePrivate::removeUrlSchemeHandler(QWebEngineUrlSchemeHandler *handler)
+/*!
+    \since 5.6
+
+    Removes the custom URL scheme handler \a handler from the profile
+*/
+void QWebEngineProfile::removeUrlSchemeHandler(QWebEngineUrlSchemeHandler *handler)
 {
-    int count = m_urlSchemeHandlers.remove(handler->scheme());
+    Q_D(QWebEngineProfile);
+    Q_ASSERT(handler);
+    if (!handler)
+        return;
+    int count = d->m_urlSchemeHandlers.remove(handler->scheme());
     if (!count)
         return;
-    browserContext()->customUrlSchemeHandlers().removeOne(handler->d_func());
-    browserContext()->updateCustomUrlSchemeHandlers();
+    disconnect(handler, SIGNAL(destroyed(QObject*)), this, SLOT(destroyedUrlSchemeHandler(QObject*)));
+    d->browserContext()->removeCustomUrlSchemeHandler(handler->d_func());
+    d->browserContext()->updateCustomUrlSchemeHandlers();
+}
+
+/*!
+    \since 5.6
+
+    Removes all custom URL scheme handlers installed in the profile.
+*/
+void QWebEngineProfile::clearUrlSchemeHandlers()
+{
+    Q_D(QWebEngineProfile);
+    d->m_urlSchemeHandlers.clear();
+    d->browserContext()->customUrlSchemeHandlers().clear();
+    d->browserContext()->updateCustomUrlSchemeHandlers();
 }
 
-void QWebEngineProfilePrivate::clearUrlSchemeHandlers()
+void QWebEngineProfile::destroyedUrlSchemeHandler(QObject *obj)
 {
-    m_urlSchemeHandlers.clear();
-    browserContext()->customUrlSchemeHandlers().clear();
-    browserContext()->updateCustomUrlSchemeHandlers();
+    removeUrlSchemeHandler(qobject_cast<QWebEngineUrlSchemeHandler*>(obj));
 }
 
 QT_END_NAMESPACE
diff --git a/src/webenginewidgets/api/qwebengineprofile.h b/src/webenginewidgets/api/qwebengineprofile.h
index c617fe361..5532f12ee 100644
--- a/src/webenginewidgets/api/qwebengineprofile.h
+++ b/src/webenginewidgets/api/qwebengineprofile.h
@@ -55,6 +55,7 @@ class QWebEngineProfilePrivate;
 class QWebEngineSettings;
 class QWebEngineScriptCollection;
 class QWebEngineUrlRequestInterceptor;
+class QWebEngineUrlSchemeHandler;
 
 class QWEBENGINEWIDGETS_EXPORT QWebEngineProfile : public QObject {
     Q_OBJECT
@@ -109,11 +110,19 @@ public:
     QWebEngineSettings *settings() const;
     QWebEngineScriptCollection *scripts() const;
 
+    const QWebEngineUrlSchemeHandler *urlSchemeHandler(const QByteArray &) const;
+    void installUrlSchemeHandler(QWebEngineUrlSchemeHandler *);
+    void removeUrlSchemeHandler(QWebEngineUrlSchemeHandler *);
+    void clearUrlSchemeHandlers();
+
     static QWebEngineProfile *defaultProfile();
 
 Q_SIGNALS:
     void downloadRequested(QWebEngineDownloadItem *download);
 
+private Q_SLOTS:
+    void destroyedUrlSchemeHandler(QObject *obj);
+
 private:
     Q_DISABLE_COPY(QWebEngineProfile)
     Q_DECLARE_PRIVATE(QWebEngineProfile)
diff --git a/src/webenginewidgets/api/qwebengineprofile_p.h b/src/webenginewidgets/api/qwebengineprofile_p.h
index ee3ea57d8..8ba64c438 100644
--- a/src/webenginewidgets/api/qwebengineprofile_p.h
+++ b/src/webenginewidgets/api/qwebengineprofile_p.h
@@ -79,18 +79,13 @@ public:
     void downloadRequested(DownloadItemInfo &info) Q_DECL_OVERRIDE;
     void downloadUpdated(const DownloadItemInfo &info) Q_DECL_OVERRIDE;
 
-    QWebEngineUrlSchemeHandler *urlSchemeHandler(const QByteArray &);
-    void installUrlSchemeHandler(QWebEngineUrlSchemeHandler *);
-    void removeUrlSchemeHandler(QWebEngineUrlSchemeHandler *);
-    void clearUrlSchemeHandlers();
-
 private:
     QWebEngineProfile *q_ptr;
     QWebEngineSettings *m_settings;
     QScopedPointer<QWebEngineScriptCollection> m_scriptCollection;
     QExplicitlySharedDataPointer<QtWebEngineCore::BrowserContextAdapter> m_browserContextRef;
     QMap<quint32, QPointer<QWebEngineDownloadItem> > m_ongoingDownloads;
-    QMap<QByteArray, QPointer<QWebEngineUrlSchemeHandler> > m_urlSchemeHandlers;
+    QMap<QByteArray, QWebEngineUrlSchemeHandler *> m_urlSchemeHandlers;
 };
 
 QT_END_NAMESPACE
diff --git a/src/webenginewidgets/api/qwebengineurlrequestjob.cpp b/src/webenginewidgets/api/qwebengineurlrequestjob.cpp
deleted file mode 100644
index 2bff57236..000000000
--- a/src/webenginewidgets/api/qwebengineurlrequestjob.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qwebengineurlrequestjob_p.h"
-
-#include "qwebengineprofile.h"
-
-#include "url_request_custom_job_delegate.h"
-
-using QtWebEngineCore::URLRequestCustomJobDelegate;
-
-QT_BEGIN_NAMESPACE
-
-/*!
-    \class QWebEngineUrlRequestJob
-    \brief The QWebEngineUrlRequestJob class represents a custom URL request.
-    \since 5.5
-    \internal
-
-    A QWebEngineUrlRequestJob is given to QWebEngineUrlSchemeHandler::requestStarted() and must
-    be handled by the derived implementations of class.
-
-    A job can be handled by calling either setReply(), redirect() or setError().
-
-    The class is owned by QtWebEngine and does not need to be deleted. Note QtWebEngine may delete
-    the job when it is no longer needed, so the signal QObject::destroyed() must be monitored if
-    a pointer to the object is stored.
-
-    \inmodule QtWebEngineWidgets
-*/
-
-/*!
-    \internal
- */
-QWebEngineUrlRequestJob::QWebEngineUrlRequestJob(URLRequestCustomJobDelegate * p)
-    : QObject(p) // owned by the jobdelegate and deleted when the job is done
-    , d_ptr(p)
-{
-}
-
-/*!
-    \internal
- */
-QWebEngineUrlRequestJob::~QWebEngineUrlRequestJob()
-{
-}
-
-/*!
-    Returns the url requested.
- */
-QUrl QWebEngineUrlRequestJob::requestUrl() const
-{
-    return d_ptr->url();
-}
-
-/*!
-    Sets the reply for the request to \a device with the mime-type \a contentType.
- */
-void QWebEngineUrlRequestJob::setReply(const QByteArray &contentType, QIODevice *device)
-{
-    d_ptr->setReply(contentType, device);
-}
-
-/*!
-    Fails the request with error \a error.
- */
-void QWebEngineUrlRequestJob::setError(Error r)
-{
-    d_ptr->fail((URLRequestCustomJobDelegate::Error)r);
-}
-
-/*!
-    Tell the request is redirected to \a url.
- */
-void QWebEngineUrlRequestJob::setRedirect(const QUrl &url)
-{
-    d_ptr->redirect(url);
-}
-
-QT_END_NAMESPACE
diff --git a/src/webenginewidgets/api/qwebengineurlrequestjob_p.h b/src/webenginewidgets/api/qwebengineurlrequestjob_p.h
deleted file mode 100644
index 32e2498fa..000000000
--- a/src/webenginewidgets/api/qwebengineurlrequestjob_p.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QWEBENGINEURLREQUESTJOB_H
-#define QWEBENGINEURLREQUESTJOB_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qtwebenginewidgetsglobal.h"
-
-#include <QtCore/QByteArray>
-#include <QtCore/QObject>
-#include <QtCore/QUrl>
-
-namespace QtWebEngineCore {
-class URLRequestCustomJobDelegate;
-} // namespace
-
-QT_BEGIN_NAMESPACE
-
-class QIODevice;
-
-class QWEBENGINEWIDGETS_EXPORT QWebEngineUrlRequestJob : public QObject {
-    Q_OBJECT
-public:
-    ~QWebEngineUrlRequestJob();
-
-    enum Error {
-        NoError = 0,
-        UrlNotFound,
-        UrlInvalid,
-        RequestAborted,
-        RequestDenied,
-        RequestFailed
-    };
-
-    QUrl requestUrl() const;
-    void setReply(const QByteArray &contentType, QIODevice *device);
-    void setError(Error error);
-    void setRedirect(const QUrl &url);
-
-private:
-    QWebEngineUrlRequestJob(QtWebEngineCore::URLRequestCustomJobDelegate *);
-    friend class QWebEngineUrlSchemeHandlerPrivate;
-
-    QtWebEngineCore::URLRequestCustomJobDelegate* d_ptr;
-};
-
-QT_END_NAMESPACE
-
-#endif // QWEBENGINEURLREQUESTJOB_H
diff --git a/src/webenginewidgets/api/qwebengineurlschemehandler.cpp b/src/webenginewidgets/api/qwebengineurlschemehandler.cpp
deleted file mode 100644
index a0e751c24..000000000
--- a/src/webenginewidgets/api/qwebengineurlschemehandler.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qwebengineurlschemehandler_p.h"
-#include "qwebengineurlschemehandler_p_p.h"
-
-#include "qwebengineprofile.h"
-#include "qwebengineprofile_p.h"
-#include "qwebengineurlrequestjob_p.h"
-
-QT_BEGIN_NAMESPACE
-
-/*!
-    \class QWebEngineUrlSchemeHandler
-    \brief The QWebEngineUrlSchemeHandler Base class for handling custom URL schemes.
-    \since 5.5
-    \internal
-
-    To implement a custom URL scheme for QtWebEngine you must write a class derived from this class,
-    and reimplement requestStarted().
-
-    To install a custom URL scheme handler into a QtWebProfile, you only need to call the constructor
-    with the correct profile. Each instance of a QWebEngineUrlSchemeHandler can only handle requests
-    from a single profile.
-
-    \inmodule QtWebEngineWidgets
-
-*/
-
-QWebEngineUrlSchemeHandlerPrivate::QWebEngineUrlSchemeHandlerPrivate(const QByteArray &scheme, QWebEngineUrlSchemeHandler *q, QWebEngineProfile *profile)
-    : CustomUrlSchemeHandler(scheme)
-    , q_ptr(q)
-    , m_profile(profile)
-{
-}
-
-QWebEngineUrlSchemeHandlerPrivate::~QWebEngineUrlSchemeHandlerPrivate()
-{
-}
-
-bool QWebEngineUrlSchemeHandlerPrivate::handleJob(QtWebEngineCore::URLRequestCustomJobDelegate *job)
-{
-    QWebEngineUrlRequestJob *requestJob = new QWebEngineUrlRequestJob(job);
-    q_ptr->requestStarted(requestJob);
-    return true;
-}
-
-/*!
-    Constructs a new URL scheme handler.
-
-    The handler is created for \a scheme and for the \a profile.
-
-  */
-QWebEngineUrlSchemeHandler::QWebEngineUrlSchemeHandler(const QByteArray &scheme, QWebEngineProfile *profile, QObject *parent)
-    : QObject(parent)
-    , d_ptr(new QWebEngineUrlSchemeHandlerPrivate(scheme, this, profile))
-{
-    profile->d_func()->installUrlSchemeHandler(this);
-}
-
-QWebEngineUrlSchemeHandler::~QWebEngineUrlSchemeHandler()
-{
-    if (d_ptr->m_profile)
-        d_ptr->m_profile->d_func()->removeUrlSchemeHandler(this);
-}
-
-/*!
-    Returns the custom URL scheme handled.
-*/
-QByteArray QWebEngineUrlSchemeHandler::scheme() const
-{
-    return d_ptr->scheme();
-}
-
-/*!
-    \fn void QWebEngineUrlSchemeHandler::requestStarted(QWebEngineUrlRequestJob *request)
-
-    This method is called whenever a request for the registered scheme is started.
-
-    This method must be reimplemented by all custom URL scheme handlers.
-    The request is asynchronous and does not need to be handled right away.
-
-    \sa QWebEngineUrlRequestJob
-*/
-
-QT_END_NAMESPACE
diff --git a/src/webenginewidgets/api/qwebengineurlschemehandler_p.h b/src/webenginewidgets/api/qwebengineurlschemehandler_p.h
deleted file mode 100644
index 7de87dff2..000000000
--- a/src/webenginewidgets/api/qwebengineurlschemehandler_p.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QWEBENGINEURLSCHEMEHANDLER_H
-#define QWEBENGINEURLSCHEMEHANDLER_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qtwebenginewidgetsglobal.h"
-
-#include <QtCore/QByteArray>
-#include <QtCore/QIODevice>
-#include <QtCore/QObject>
-#include <QtCore/QScopedPointer>
-#include <QtCore/QUrl>
-
-QT_BEGIN_NAMESPACE
-
-class QWebEngineProfile;
-class QWebEngineUrlRequestJob;
-class QWebEngineUrlSchemeHandlerPrivate;
-
-class QWEBENGINEWIDGETS_EXPORT QWebEngineUrlSchemeHandler : public QObject {
-    Q_OBJECT
-public:
-    QWebEngineUrlSchemeHandler(const QByteArray &scheme, QWebEngineProfile *profile, QObject *parent = 0);
-    virtual ~QWebEngineUrlSchemeHandler();
-
-    QByteArray scheme() const;
-
-    virtual void requestStarted(QWebEngineUrlRequestJob*) = 0;
-
-private:
-    Q_DECLARE_PRIVATE(QWebEngineUrlSchemeHandler)
-    friend class QWebEngineProfilePrivate;
-    QScopedPointer<QWebEngineUrlSchemeHandlerPrivate> d_ptr;
-};
-
-QT_END_NAMESPACE
-
-#endif // QWEBENGINEURLSCHEMEHANDLER_H
diff --git a/src/webenginewidgets/api/qwebengineurlschemehandler_p_p.h b/src/webenginewidgets/api/qwebengineurlschemehandler_p_p.h
deleted file mode 100644
index d349d7d8c..000000000
--- a/src/webenginewidgets/api/qwebengineurlschemehandler_p_p.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QWEBENGINEURLSCHEMEHANDLER_P_H
-#define QWEBENGINEURLSCHEMEHANDLER_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qwebengineurlschemehandler_p.h"
-
-#include "custom_url_scheme_handler.h"
-
-#include <QPointer>
-
-QT_BEGIN_NAMESPACE
-
-class QWebEngineProfile;
-class QWebEngineUrlRequestJob;
-class QWebEngineUrlSchemeHandler;
-
-class QWebEngineUrlSchemeHandlerPrivate : public QtWebEngineCore::CustomUrlSchemeHandler {
-public:
-    Q_DECLARE_PUBLIC(QWebEngineUrlSchemeHandler)
-
-    QWebEngineUrlSchemeHandlerPrivate(const QByteArray &, QWebEngineUrlSchemeHandler *, QWebEngineProfile *);
-    virtual ~QWebEngineUrlSchemeHandlerPrivate();
-
-    virtual bool handleJob(QtWebEngineCore::URLRequestCustomJobDelegate*) Q_DECL_OVERRIDE;
-
-private:
-    QWebEngineUrlSchemeHandler *q_ptr;
-    QPointer<QWebEngineProfile> m_profile;
-};
-
-QT_END_NAMESPACE
-
-#endif // QWEBENGINEURLSCHEMEHANDLER_P_H
diff --git a/src/webenginewidgets/webenginewidgets.pro b/src/webenginewidgets/webenginewidgets.pro
index 0d92767c1..c32185563 100644
--- a/src/webenginewidgets/webenginewidgets.pro
+++ b/src/webenginewidgets/webenginewidgets.pro
@@ -20,8 +20,6 @@ SOURCES = \
         api/qwebenginescript.cpp \
         api/qwebenginescriptcollection.cpp \
         api/qwebenginesettings.cpp \
-        api/qwebengineurlrequestjob.cpp \
-        api/qwebengineurlschemehandler.cpp \
         api/qwebengineview.cpp \
         render_widget_host_view_qt_delegate_widget.cpp
 
@@ -38,9 +36,6 @@ HEADERS = \
         api/qwebenginescriptcollection.h \
         api/qwebenginescriptcollection_p.h \
         api/qwebenginesettings.h \
-        api/qwebengineurlrequestjob_p.h \
-        api/qwebengineurlschemehandler_p.h \
-        api/qwebengineurlschemehandler_p_p.h \
         api/qwebengineview.h \
         api/qwebengineview_p.h \
         render_widget_host_view_qt_delegate_widget.h