Cleanup the QtWebEngineWidgets public headers and API

Headers were left intact to leave a trace of the evolution compared
to the QtWebKit API and to make it easier to work until we had a
basic subset of the API implemented.

With the upcoming release, this patch removes this convenience in the
aim of starting polishing the headers and the documentation for the
upcoming release.

Change-Id: Iae436b4ec041d771a7002575e122835802bc9f3e
Reviewed-by: Michael Bruning <michael.bruning@digia.com>

8 files changed, 0 insertions, 785 deletions

diff --git a/src/webenginewidgets/api/qwebenginehistory.cpp b/src/webenginewidgets/api/qwebenginehistory.cpp
index cbd3fb3b1..8d4267b53 100644
--- a/src/webenginewidgets/api/qwebenginehistory.cpp
+++ b/src/webenginewidgets/api/qwebenginehistory.cpp
@@ -45,10 +45,6 @@
 #include "qwebenginepage_p.h"
 #include "web_contents_adapter.h"
 
-#if defined(Q_OS_WIN)
-#define __func__ __FUNCTION__
-#endif
-
 QT_BEGIN_NAMESPACE
 
 QWebEngineHistoryItemPrivate::QWebEngineHistoryItemPrivate(QWebEnginePagePrivate *page, int index)
@@ -101,23 +97,6 @@ QDateTime QWebEngineHistoryItem::lastVisited() const
     return d->page ? d->page->webContents()->getNavigationEntryTimestamp(d->index) : QDateTime();
 }
 
-QIcon QWebEngineHistoryItem::icon() const
-{
-    qWarning("Not implemented: %s", __func__);
-    return QIcon();
-}
-
-QVariant QWebEngineHistoryItem::userData() const
-{
-    return QVariant();
-}
-
-void QWebEngineHistoryItem::setUserData(const QVariant& userData)
-{
-    Q_UNUSED(userData);
-    qWarning("Not implemented: %s", __func__);
-}
-
 bool QWebEngineHistoryItem::isValid() const
 {
     Q_D(const QWebEngineHistoryItem);
@@ -269,17 +248,6 @@ int QWebEngineHistory::count() const
     return d->page->webContents()->navigationEntryCount();
 }
 
-int QWebEngineHistory::maximumItemCount() const
-{
-    return 100;
-}
-
-void QWebEngineHistory::setMaximumItemCount(int count)
-{
-    Q_UNUSED(count);
-    qWarning("Not implemented: %s", __func__);
-}
-
 QDataStream& operator<<(QDataStream& stream, const QWebEngineHistory& history)
 {
     history.d_func()->page->webContents()->serializeNavigationHistory(stream);
diff --git a/src/webenginewidgets/api/qwebenginehistory.h b/src/webenginewidgets/api/qwebenginehistory.h
index b8ea6b863..b56cdd883 100644
--- a/src/webenginewidgets/api/qwebenginehistory.h
+++ b/src/webenginewidgets/api/qwebenginehistory.h
@@ -47,11 +47,6 @@ public:
     QString title() const;
     QDateTime lastVisited() const;
 
-    QIcon icon() const;
-
-    QVariant userData() const;
-    void setUserData(const QVariant& userData);
-
     bool isValid() const;
 private:
     QWebEngineHistoryItem(QWebEngineHistoryItemPrivate *priv);
@@ -87,9 +82,6 @@ public:
 
     int count() const;
 
-    int maximumItemCount() const;
-    void setMaximumItemCount(int count);
-
 private:
     QWebEngineHistory(QWebEngineHistoryPrivate *d);
     ~QWebEngineHistory();
diff --git a/src/webenginewidgets/api/qwebenginehistoryinterface.h b/src/webenginewidgets/api/qwebenginehistoryinterface.h
deleted file mode 100644
index b8108c516..000000000
--- a/src/webenginewidgets/api/qwebenginehistoryinterface.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-    Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-    Copyright (C) 2007 Staikos Computing Services, Inc.  <info@staikos.net>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
-
-    This class provides all functionality needed for tracking global history.
-*/
-
-#ifndef QWEBENGINEHISTORYINTERFACE_H
-#define QWEBENGINEHISTORYINTERFACE_H
-
-#include <QtCore/qobject.h>
-#include <QtWebEngineWidgets/qtwebenginewidgetsglobal.h>
-
-QT_BEGIN_NAMESPACE
-
-class QWEBENGINEWIDGETS_EXPORT QWebEngineHistoryInterface : public QObject {
-    Q_OBJECT
-public:
-    QWebEngineHistoryInterface(QObject *parent = 0);
-    ~QWebEngineHistoryInterface();
-
-    static void setDefaultInterface(QWebEngineHistoryInterface *defaultInterface);
-    static QWebEngineHistoryInterface *defaultInterface();
-
-    virtual bool historyContains(const QString &url) const = 0;
-    virtual void addHistoryEntry(const QString &url) = 0;
-};
-
-QT_END_NAMESPACE
-
-#endif // QWEBENGINEHISTORYINTERFACE_H
diff --git a/src/webenginewidgets/api/qwebengineinspector.h b/src/webenginewidgets/api/qwebengineinspector.h
deleted file mode 100644
index 9427b4e5c..000000000
--- a/src/webenginewidgets/api/qwebengineinspector.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-    Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-    Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
-*/
-
-#ifndef QWEBENGINEINSPECTOR_H
-#define QWEBENGINEINSPECTOR_H
-
-#include <QtWebEngineWidgets/qtwebenginewidgetsglobal.h>
-
-QT_BEGIN_NAMESPACE
-
-class QWebEnginePage;
-class QWebEngineInspectorPrivate;
-
-class QWEBENGINEWIDGETS_EXPORT QWebEngineInspector : public QWidget {
-    Q_OBJECT
-public:
-    QWebEngineInspector(QWidget* parent = 0);
-    ~QWebEngineInspector();
-
-    void setPage(QWebEnginePage* page);
-    QWebEnginePage* page() const;
-};
-
-QT_END_NAMESPACE
-
-#endif // QWEBENGINEINSPECTOR_H
diff --git a/src/webenginewidgets/api/qwebenginepage.h b/src/webenginewidgets/api/qwebenginepage.h
index 29ba140bc..4e0eaf27f 100644
--- a/src/webenginewidgets/api/qwebenginepage.h
+++ b/src/webenginewidgets/api/qwebenginepage.h
@@ -23,7 +23,6 @@
 #define QWEBENGINEPAGE_H
 
 #include <QtWebEngineWidgets/qtwebenginewidgetsglobal.h>
-#include <QtWebEngineWidgets/qwebenginesettings.h>
 
 #include <QtCore/qobject.h>
 #include <QtCore/qurl.h>
@@ -32,24 +31,10 @@
 #include <QtWidgets/qwidget.h>
 
 QT_BEGIN_NAMESPACE
-class QUndoStack;
 class QMenu;
-class QPrinter;
-
-// FIXME: Just forward-declare the to-be-removed frame and element classes for now.
-// Referencing calls should be ported to be page-friendly or removed individually.
-class QWebEngineFrame;
-class QWebEngineElement;
-class QWebEngineElementCollection;
-
 class QWebEngineHistory;
-class QWebEngineHistoryItem;
 class QWebEnginePage;
 class QWebEnginePagePrivate;
-class QWebEnginePluginFactory;
-class QWebEngineSecurityOrigin;
-class QtViewportAttributesPrivate;
-class QWebEngineHitTestResultPrivate;
 
 namespace QtWebEnginePrivate {
 
@@ -82,92 +67,20 @@ private:
     friend class QWebEnginePage;
 };
 
-class QWEBENGINEWIDGETS_EXPORT QWebEngineHitTestResult {
-public:
-    QWebEngineHitTestResult();
-    QWebEngineHitTestResult(const QWebEngineHitTestResult &other);
-    QWebEngineHitTestResult &operator=(const QWebEngineHitTestResult &other);
-    ~QWebEngineHitTestResult();
-
-    bool isNull() const;
-
-    QPoint pos() const;
-    QRect boundingRect() const;
-    QWebEngineElement enclosingBlockElement() const;
-    QString title() const;
-
-    QString linkText() const;
-    QUrl linkUrl() const;
-    QUrl linkTitle() const;
-    QWebEngineFrame *linkTargetFrame() const;
-    QWebEngineElement linkElement() const;
-
-    QString alternateText() const; // for img, area, input and applet
-
-    QUrl imageUrl() const;
-    QPixmap pixmap() const;
-
-    bool isContentEditable() const;
-    bool isContentSelected() const;
-
-    QWebEngineElement element() const;
-
-    QWebEngineFrame *frame() const;
-};
-
 class QWEBENGINEWIDGETS_EXPORT QWebEnginePage : public QObject {
     Q_OBJECT
-// Hack to avoid undefined symbols with properties until we have them implemented.
-#ifndef Q_MOC_RUN
-    Q_PROPERTY(bool modified READ isModified)
     Q_PROPERTY(QString selectedText READ selectedText)
-    Q_PROPERTY(QString selectedHtml READ selectedHtml)
     Q_PROPERTY(bool hasSelection READ hasSelection)
-    Q_PROPERTY(QSize viewportSize READ viewportSize WRITE setViewportSize)
-    Q_PROPERTY(QSize preferredContentsSize READ preferredContentsSize WRITE setPreferredContentsSize)
-    Q_PROPERTY(bool forwardUnsupportedContent READ forwardUnsupportedContent WRITE setForwardUnsupportedContent)
-    Q_PROPERTY(LinkDelegationPolicy linkDelegationPolicy READ linkDelegationPolicy WRITE setLinkDelegationPolicy)
-    Q_PROPERTY(QPalette palette READ palette WRITE setPalette)
-    Q_PROPERTY(bool contentEditable READ isContentEditable WRITE setContentEditable)
-    Q_ENUMS(LinkDelegationPolicy NavigationType WebAction)
 
     // Ex-QWebFrame properties
-    Q_PROPERTY(qreal textSizeMultiplier READ textSizeMultiplier WRITE setTextSizeMultiplier DESIGNABLE false)
     Q_PROPERTY(QUrl requestedUrl READ requestedUrl)
-    Q_PROPERTY(QIcon icon READ icon)
-    Q_PROPERTY(QSize contentsSize READ contentsSize)
-    Q_PROPERTY(QPoint scrollPosition READ scrollPosition WRITE setScrollPosition)
-    Q_PROPERTY(bool focus READ hasFocus)
-#endif
     Q_PROPERTY(qreal zoomFactor READ zoomFactor WRITE setZoomFactor)
     Q_PROPERTY(QString title READ title)
     Q_PROPERTY(QUrl url READ url WRITE setUrl)
 
 public:
-    enum NavigationType {
-        NavigationTypeLinkClicked,
-        NavigationTypeFormSubmitted,
-        NavigationTypeBackOrForward,
-        NavigationTypeReload,
-        NavigationTypeFormResubmitted,
-        NavigationTypeOther
-    };
-
     enum WebAction {
         NoWebAction = - 1,
-
-        OpenLink,
-
-        OpenLinkInNewWindow,
-        OpenFrameInNewWindow,
-
-        DownloadLinkToDisk,
-        CopyLinkToClipboard,
-
-        OpenImageInNewWindow,
-        DownloadImageToDisk,
-        CopyImageToClipboard,
-
         Back,
         Forward,
         Stop,
@@ -179,70 +92,10 @@ public:
 
         Undo,
         Redo,
-        MoveToNextChar,
-        MoveToPreviousChar,
-        MoveToNextWord,
-        MoveToPreviousWord,
-        MoveToNextLine,
-        MoveToPreviousLine,
-        MoveToStartOfLine,
-        MoveToEndOfLine,
-        MoveToStartOfBlock,
-        MoveToEndOfBlock,
-        MoveToStartOfDocument,
-        MoveToEndOfDocument,
-        SelectNextChar,
-        SelectPreviousChar,
-        SelectNextWord,
-        SelectPreviousWord,
-        SelectNextLine,
-        SelectPreviousLine,
-        SelectStartOfLine,
-        SelectEndOfLine,
-        SelectStartOfBlock,
-        SelectEndOfBlock,
-        SelectStartOfDocument,
-        SelectEndOfDocument,
-        DeleteStartOfWord,
-        DeleteEndOfWord,
-
-        SetTextDirectionDefault,
-        SetTextDirectionLeftToRight,
-        SetTextDirectionRightToLeft,
-
-        ToggleBold,
-        ToggleItalic,
-        ToggleUnderline,
-
-        InspectElement,
-
-        InsertParagraphSeparator,
-        InsertLineSeparator,
-
         SelectAll,
         ReloadAndBypassCache,
 
         PasteAndMatchStyle,
-        RemoveFormat,
-
-        ToggleStrikethrough,
-        ToggleSubscript,
-        ToggleSuperscript,
-        InsertUnorderedList,
-        InsertOrderedList,
-        Indent,
-        Outdent,
-
-        AlignCenter,
-        AlignJustified,
-        AlignLeft,
-        AlignRight,
-
-        StopScheduledPageRefresh,
-
-        CopyImageUrlToClipboard,
-
-        OpenLinkInThisWindow,
 
         WebActionCount
     };
@@ -252,36 +105,13 @@ public:
         FindCaseSensitively = 2,
     };
     Q_DECLARE_FLAGS(FindFlags, FindFlag)
-
-    enum LinkDelegationPolicy {
-        DontDelegateLinks,
-        DelegateExternalLinks,
-        DelegateAllLinks
-    };
-
     enum WebWindowType {
         WebBrowserWindow,
         WebBrowserTab,
         WebDialog
     };
 
-    enum PermissionPolicy {
-        PermissionUnknown,
-        PermissionGrantedByUser,
-        PermissionDeniedByUser
-    };
-
-    enum Feature {
-        Notifications,
-        Geolocation
-    };
-
     // Ex-QWebFrame enum
-    enum ValueOwnership {
-        QtOwnership,
-        ScriptOwnership,
-        AutoOwnership
-    };
 
     enum FileSelectionMode {
         FileSelectOpen,
@@ -295,152 +125,30 @@ public:
         Error
     };
 
-    class QWEBENGINEWIDGETS_EXPORT ViewportAttributes {
-    public:
-        ViewportAttributes();
-        ViewportAttributes(const QWebEnginePage::ViewportAttributes& other);
-
-        ~ViewportAttributes();
-
-        QWebEnginePage::ViewportAttributes& operator=(const QWebEnginePage::ViewportAttributes& other);
-
-        inline qreal initialScaleFactor() const { return m_initialScaleFactor; }
-        inline qreal minimumScaleFactor() const { return m_minimumScaleFactor; }
-        inline qreal maximumScaleFactor() const { return m_maximumScaleFactor; }
-        inline qreal devicePixelRatio() const { return m_devicePixelRatio; }
-        inline bool isUserScalable() const { return m_isUserScalable; }
-        inline bool isValid() const { return m_isValid; }
-        inline QSizeF size() const { return m_size; }
-
-    private:
-        QSharedDataPointer<QtViewportAttributesPrivate> d;
-        qreal m_initialScaleFactor;
-        qreal m_minimumScaleFactor;
-        qreal m_maximumScaleFactor;
-        qreal m_devicePixelRatio;
-        bool m_isUserScalable;
-        bool m_isValid;
-        QSizeF m_size;
-
-        friend class QWebEnginePage;
-    };
-
-
     explicit QWebEnginePage(QObject *parent = 0);
     ~QWebEnginePage();
-
-    QWebEngineFrame *mainFrame() const;
-    QWebEngineFrame *currentFrame() const;
-    QWebEngineFrame* frameAt(const QPoint& pos) const;
-
     QWebEngineHistory *history() const;
-    QWebEngineSettings *settings() const;
 
     void setView(QWidget *view);
     QWidget *view() const;
 
-    bool isModified() const;
-#ifndef QT_NO_UNDOSTACK
-    QUndoStack *undoStack() const;
-#endif
-
-    void setNetworkAccessManager(QNetworkAccessManager *manager);
-    QNetworkAccessManager *networkAccessManager() const;
-
-    void setPluginFactory(QWebEnginePluginFactory *factory);
-    QWebEnginePluginFactory *pluginFactory() const;
-
-    quint64 totalBytes() const;
-    quint64 bytesReceived() const;
-
     bool hasSelection() const;
     QString selectedText() const;
-    QString selectedHtml() const;
 
 #ifndef QT_NO_ACTION
     QAction *action(WebAction action) const;
 #endif
     virtual void triggerAction(WebAction action, bool checked = false);
 
-    QSize viewportSize() const;
-    void setViewportSize(const QSize &size);
-    ViewportAttributes viewportAttributesForSize(const QSize& availableSize) const;
-
-    QSize preferredContentsSize() const;
-    void setPreferredContentsSize(const QSize &size) const;
-    void setActualVisibleContentRect(const QRect& rect) const;
-
     virtual bool event(QEvent*);
-    bool focusNextPrevChild(bool next);
-
-    QVariant inputMethodQuery(Qt::InputMethodQuery property) const;
-
     void findText(const QString &subString, FindFlags options = 0, const QWebEngineCallback<bool> &resultCallback = QWebEngineCallback<bool>());
-
-    void setForwardUnsupportedContent(bool forward);
-    bool forwardUnsupportedContent() const;
-
-    void setLinkDelegationPolicy(LinkDelegationPolicy policy);
-    LinkDelegationPolicy linkDelegationPolicy() const;
-
-    void setPalette(const QPalette &palette);
-    QPalette palette() const;
-
-    void setContentEditable(bool editable);
-    bool isContentEditable() const;
-
-#ifndef QT_NO_CONTEXTMENU
-    bool swallowContextMenuEvent(QContextMenuEvent *event);
-#endif
-    void updatePositionDependentActions(const QPoint &pos);
-
     QMenu *createStandardContextMenu();
 
-    void setFeaturePermission(QWebEngineFrame* frame, Feature feature, PermissionPolicy policy);
-
-    QStringList supportedContentTypes() const;
-    bool supportsContentType(const QString& mimeType) const;
-
-    enum Extension {
-        ErrorPageExtension
-    };
-    class ExtensionOption
-    {};
-    class ExtensionReturn
-    {};
-
-    enum ErrorDomain { QtNetwork, Http, WebKit };
-    class ErrorPageExtensionOption : public ExtensionOption {
-    public:
-        QUrl url;
-        QWebEngineFrame* frame;
-        ErrorDomain domain;
-        int error;
-        QString errorString;
-    };
-
-    class ErrorPageExtensionReturn : public ExtensionReturn {
-    public:
-        ErrorPageExtensionReturn() : contentType(QLatin1String("text/html")), encoding(QLatin1String("utf-8")) {};
-        QString contentType;
-        QString encoding;
-        QUrl baseUrl;
-        QByteArray content;
-    };
-
-
-    virtual bool extension(Extension extension, const ExtensionOption *option = 0, ExtensionReturn *output = 0) { Q_UNUSED(extension); Q_UNUSED(option); Q_UNUSED(output); Q_UNREACHABLE(); return false; }
-    virtual bool supportsExtension(Extension extension) const { Q_UNUSED(extension); Q_UNREACHABLE(); return false; }
-
-    virtual bool shouldInterruptJavaScript() { Q_UNREACHABLE(); return false; }
-
     // Ex-QWebFrame methods
     void load(const QUrl &url);
-    void load(const QNetworkRequest &request, QNetworkAccessManager::Operation operation = QNetworkAccessManager::GetOperation, const QByteArray &body = QByteArray());
     void setHtml(const QString &html, const QUrl &baseUrl = QUrl());
     void setContent(const QByteArray &data, const QString &mimeType = QString(), const QUrl &baseUrl = QUrl());
 
-    void addToJavaScriptWindowObject(const QString &name, QObject *object, ValueOwnership ownership = QtOwnership);
     void toHtml(const QWebEngineCallback<const QString &> &resultCallback) const;
     void toPlainText(const QWebEngineCallback<const QString &> &resultCallback) const;
 
@@ -448,139 +156,38 @@ public:
     void setUrl(const QUrl &url);
     QUrl url() const;
     QUrl requestedUrl() const;
-    QIcon icon() const;
-    QMultiMap<QString, QString> metaData() const;
-
-    QString frameName() const;
-
-    QWebEngineFrame *parentFrame() const;
-    QList<QWebEngineFrame*> childFrames() const;
-
-    Qt::ScrollBarPolicy scrollBarPolicy(Qt::Orientation orientation) const;
-    void setScrollBarPolicy(Qt::Orientation orientation, Qt::ScrollBarPolicy policy);
-
-    void setScrollBarValue(Qt::Orientation orientation, int value);
-    int scrollBarValue(Qt::Orientation orientation) const;
-    int scrollBarMinimum(Qt::Orientation orientation) const;
-    int scrollBarMaximum(Qt::Orientation orientation) const;
-    QRect scrollBarGeometry(Qt::Orientation orientation) const;
-
-    void scroll(int, int);
-    QPoint scrollPosition() const;
-    void setScrollPosition(const QPoint &pos);
-
-    void scrollToAnchor(const QString& anchor);
-
-    enum RenderLayer {
-        ContentsLayer = 0x10,
-        ScrollBarLayer = 0x20,
-        PanIconLayer = 0x40,
-
-        AllLayers = 0xff
-    };
-    Q_DECLARE_FLAGS(RenderLayers, RenderLayer)
-
-    void render(QPainter*, const QRegion& clip = QRegion());
-    void render(QPainter*, RenderLayers layer, const QRegion& clip = QRegion());
-
-    void setTextSizeMultiplier(qreal factor);
-    qreal textSizeMultiplier() const;
 
     qreal zoomFactor() const;
     void setZoomFactor(qreal factor);
 
-    bool hasFocus() const;
-    void setFocus();
-
-    QPoint pos() const;
-    QRect geometry() const;
-    QSize contentsSize() const;
-
-    QWebEngineElement documentElement() const;
-    QWebEngineElementCollection findAllElements(const QString &selectorQuery) const;
-    QWebEngineElement findFirstElement(const QString &selectorQuery) const;
-
-    QWebEngineHitTestResult hitTestContent(const QPoint &pos) const;
-
-    QWebEngineSecurityOrigin securityOrigin() const;
-
     void runJavaScript(const QString& scriptSource, const QString &xPath = QString());
     void runJavaScript(const QString& scriptSource, const QWebEngineCallback<const QVariant &> &resultCallback, const QString &xPath = QString());
 
-public Q_SLOTS:
-    // Ex-QWebFrame slot
-#ifndef QT_NO_PRINTER
-    void print(QPrinter *printer) const { Q_UNUSED(printer); Q_UNREACHABLE(); }
-#endif
-
-
 Q_SIGNALS:
     void loadStarted();
     void loadProgress(int progress);
     void loadFinished(bool ok);
 
-    void linkHovered(const QString &link, const QString &title, const QString &textContent);
-    void statusBarMessage(const QString& text);
     void selectionChanged();
-    void frameCreated(QWebEngineFrame *frame);
     void geometryChangeRequested(const QRect& geom);
-    void repaintRequested(const QRect& dirtyRect);
-    void scrollRequested(int dx, int dy, const QRect& scrollViewRect);
     void windowCloseRequested();
-    void printRequested(QWebEngineFrame *frame);
-    void linkClicked(const QUrl &url);
-
-    void toolBarVisibilityChangeRequested(bool visible);
-    void statusBarVisibilityChangeRequested(bool visible);
-    void menuBarVisibilityChangeRequested(bool visible);
-
-    void unsupportedContent(QNetworkReply *reply);
-    void downloadRequested(const QNetworkRequest &request);
-
-    void microFocusChanged();
-    void contentsChanged();
-    void databaseQuotaExceeded(QWebEngineFrame* frame, QString databaseName);
-    void applicationCacheQuotaExceeded(QWebEngineSecurityOrigin* origin, quint64 defaultOriginQuota, quint64 totalSpaceNeeded);
-
-    void saveFrameStateRequested(QWebEngineFrame* frame, QWebEngineHistoryItem* item);
-    void restoreFrameStateRequested(QWebEngineFrame* frame);
-
-    void viewportChangeRequested();
-
-    void featurePermissionRequested(QWebEngineFrame* frame, QWebEnginePage::Feature feature);
-    void featurePermissionRequestCanceled(QWebEngineFrame* frame, QWebEnginePage::Feature feature);
 
     void authenticationRequired(const QUrl &requestUrl, QAuthenticator *authenticator);
     void proxyAuthenticationRequired(const QUrl &requestUrl, QAuthenticator *authenticator, const QString &proxyHost);
 
     // Ex-QWebFrame signals
-    void javaScriptWindowObjectCleared();
-
-    void provisionalLoad();
     void titleChanged(const QString &title);
     void urlChanged(const QUrl &url);
 
-    void initialLayoutCompleted();
-
-    void iconChanged();
-
-    void contentsSizeChanged(const QSize &size);
-
-    void pageChanged();
-
 protected:
     virtual QWebEnginePage *createWindow(WebWindowType type);
-    virtual QObject *createPlugin(const QString &classid, const QUrl &url, const QStringList &paramNames, const QStringList &paramValues) { Q_UNUSED(classid); Q_UNUSED(url); Q_UNUSED(paramNames); Q_UNUSED(paramValues); Q_UNREACHABLE(); return 0; }
 
-    virtual bool acceptNavigationRequest(QWebEngineFrame *frame, const QNetworkRequest &request, NavigationType type) { Q_UNUSED(frame); Q_UNUSED(&request); Q_UNUSED(type); Q_UNREACHABLE(); return false; }
     virtual QStringList chooseFiles(FileSelectionMode mode, const QStringList &oldFiles, const QStringList &acceptedMimeTypes);
     virtual void javaScriptAlert(const QUrl &securityOrigin, const QString& msg);
     virtual bool javaScriptConfirm(const QUrl &securityOrigin, const QString& msg);
     virtual bool javaScriptPrompt(const QUrl &securityOrigin, const QString& msg, const QString& defaultValue, QString* result);
     virtual void javaScriptConsoleMessage(JavaScriptConsoleMessageLevel level, const QString& message, int lineNumber, const QString& sourceID);
 
-    virtual QString userAgentForUrl(const QUrl& url) const { Q_UNUSED(url); Q_UNREACHABLE(); return QString(); }
-
 private:
     Q_DECLARE_PRIVATE(QWebEnginePage);
 #ifndef QT_NO_ACTION
@@ -591,8 +198,6 @@ private:
     friend class QWebEngineViewPrivate;
 };
 
-Q_DECLARE_OPERATORS_FOR_FLAGS(QWebEnginePage::FindFlags);
-Q_DECLARE_OPERATORS_FOR_FLAGS(QWebEnginePage::RenderLayers);
 
 QT_END_NAMESPACE
 
diff --git a/src/webenginewidgets/api/qwebenginesecurityorigin.h b/src/webenginewidgets/api/qwebenginesecurityorigin.h
deleted file mode 100644
index c943bec84..000000000
--- a/src/webenginewidgets/api/qwebenginesecurityorigin.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-    Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-    Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
-*/
-
-#ifndef QWEBENGINESECURITYORIGIN_H_
-#define QWEBENGINESECURITYORIGIN_H_
-
-#include <QtWebEngineWidgets/qtwebenginewidgetsglobal.h>
-
-QT_BEGIN_NAMESPACE
-class QWebEngineDatabase;
-class QWebEngineSecurityOriginPrivate;
-
-class QWEBENGINEWIDGETS_EXPORT QWebEngineSecurityOrigin {
-public:
-    static QList<QWebEngineSecurityOrigin> allOrigins();
-    static void addLocalScheme(const QString& scheme);
-    static void removeLocalScheme(const QString& scheme);
-    static QStringList localSchemes();
-
-    ~QWebEngineSecurityOrigin();
-
-    QString scheme() const;
-    QString host() const;
-    int port() const;
-
-    qint64 databaseUsage() const;
-    qint64 databaseQuota() const;
-    void setDatabaseQuota(qint64 quota);
-    void setApplicationCacheQuota(qint64 quota);
-    QList<QWebEngineDatabase> databases() const;
-};
-
-QT_END_NAMESPACE
-
-#endif // QWEBENGINESECURITYORIGIN_H_
diff --git a/src/webenginewidgets/api/qwebenginesettings.h b/src/webenginewidgets/api/qwebenginesettings.h
deleted file mode 100644
index 177a975fd..000000000
--- a/src/webenginewidgets/api/qwebenginesettings.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
-    Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-    Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
-*/
-
-#ifndef QWEBENGINESETTINGS_H
-#define QWEBENGINESETTINGS_H
-
-#include <QtWebEngineWidgets/qtwebenginewidgetsglobal.h>
-#include <QtCore/qstring.h>
-
-QT_BEGIN_NAMESPACE
-
-class QIcon;
-class QPixmap;
-class QUrl;
-class QWebEngineSettingsPrivate;
-
-class QWEBENGINEWIDGETS_EXPORT QWebEngineSettings {
-public:
-    enum FontFamily {
-        StandardFont,
-        FixedFont,
-        SerifFont,
-        SansSerifFont,
-        CursiveFont,
-        FantasyFont
-    };
-    enum WebAttribute {
-        AutoLoadImages,
-        JavascriptEnabled,
-        JavaEnabled,
-        PluginsEnabled,
-        PrivateBrowsingEnabled,
-        JavascriptCanOpenWindows,
-        JavascriptCanAccessClipboard,
-        DeveloperExtrasEnabled,
-        LinksIncludedInFocusChain,
-        ZoomTextOnly,
-        PrintElementBackgrounds,
-        OfflineStorageDatabaseEnabled,
-        OfflineWebApplicationCacheEnabled,
-        LocalStorageEnabled,
-#if defined(QT_DEPRECATED) || defined(qdoc)
-        LocalStorageDatabaseEnabled = LocalStorageEnabled,
-#endif
-        LocalContentCanAccessRemoteUrls,
-        DnsPrefetchEnabled,
-        XSSAuditingEnabled,
-        AcceleratedCompositingEnabled,
-        SpatialNavigationEnabled,
-        LocalContentCanAccessFileUrls,
-        TiledBackingStoreEnabled,
-        FrameFlatteningEnabled,
-        SiteSpecificQuirksEnabled,
-        JavascriptCanCloseWindows,
-        WebGLEnabled,
-        CSSRegionsEnabled,
-        HyperlinkAuditingEnabled,
-        CSSGridLayoutEnabled,
-        ScrollAnimatorEnabled,
-        CaretBrowsingEnabled,
-        NotificationsEnabled
-    };
-    enum WebGraphic {
-        MissingImageGraphic,
-        MissingPluginGraphic,
-        DefaultFrameIconGraphic,
-        TextAreaSizeGripCornerGraphic,
-        DeleteButtonGraphic,
-        InputSpeechButtonGraphic,
-        SearchCancelButtonGraphic,
-        SearchCancelButtonPressedGraphic
-    };
-    enum FontSize {
-        MinimumFontSize,
-        MinimumLogicalFontSize,
-        DefaultFontSize,
-        DefaultFixedFontSize
-    };
-    enum ThirdPartyCookiePolicy {
-        AlwaysAllowThirdPartyCookies,
-        AlwaysBlockThirdPartyCookies,
-        AllowThirdPartyWithExistingCookies
-    };
-
-    static QWebEngineSettings *globalSettings();
-
-    void setFontFamily(FontFamily which, const QString &family);
-    QString fontFamily(FontFamily which) const;
-    void resetFontFamily(FontFamily which);
-
-    void setFontSize(FontSize type, int size);
-    int fontSize(FontSize type) const;
-    void resetFontSize(FontSize type);
-
-    void setAttribute(WebAttribute attr, bool on);
-    bool testAttribute(WebAttribute attr) const;
-    void resetAttribute(WebAttribute attr);
-
-    void setUserStyleSheetUrl(const QUrl &location);
-    QUrl userStyleSheetUrl() const;
-
-    void setDefaultTextEncoding(const QString &encoding);
-    QString defaultTextEncoding() const;
-
-    static void setIconDatabasePath(const QString &location);
-    static QString iconDatabasePath();
-    static void clearIconDatabase();
-    static QIcon iconForUrl(const QUrl &url);
-
-    //static QWebEnginePluginDatabase *pluginDatabase();
-
-    static void setWebGraphic(WebGraphic type, const QPixmap &graphic);
-    static QPixmap webGraphic(WebGraphic type);
-
-    static void setMaximumPagesInCache(int pages);
-    static int maximumPagesInCache();
-    static void setObjectCacheCapacities(int cacheMinDeadCapacity, int cacheMaxDead, int totalCapacity);
-
-    static void setOfflineStoragePath(const QString& path);
-    static QString offlineStoragePath();
-    static void setOfflineStorageDefaultQuota(qint64 maximumSize);
-    static qint64 offlineStorageDefaultQuota();
-
-    static void setOfflineWebApplicationCachePath(const QString& path);
-    static QString offlineWebApplicationCachePath();
-    static void setOfflineWebApplicationCacheQuota(qint64 maximumSize);
-    static qint64 offlineWebApplicationCacheQuota();
-
-    void setLocalStoragePath(const QString& path);
-    QString localStoragePath() const;
-
-    static void clearMemoryCaches();
-
-    static void enablePersistentStorage(const QString& path = QString());
-
-    void setThirdPartyCookiePolicy(ThirdPartyCookiePolicy);
-    QWebEngineSettings::ThirdPartyCookiePolicy thirdPartyCookiePolicy() const;
-
-    void setCSSMediaType(const QString&);
-    QString cssMediaType() const;
-
-private:
-    Q_DISABLE_COPY(QWebEngineSettings)
-
-    QWebEngineSettings();
-    ~QWebEngineSettings();
-
-    QWebEngineSettingsPrivate *d;
-};
-
-QT_END_NAMESPACE
-
-#endif // QWEBENGINESETTINGS_H
diff --git a/src/webenginewidgets/api/qwebengineview.h b/src/webenginewidgets/api/qwebengineview.h
index 5e7dfa0e9..02f599d45 100644
--- a/src/webenginewidgets/api/qwebengineview.h
+++ b/src/webenginewidgets/api/qwebengineview.h
@@ -31,33 +31,18 @@
 
 QT_BEGIN_NAMESPACE
 class QContextMenuEvent;
-class QIcon;
-class QNetworkRequest;
-class QPrinter;
 class QUrl;
 class QWebEnginePage;
 class QWebEngineViewPrivate;
-class QWebEngineNetworkRequest;
 
 class QWEBENGINEWIDGETS_EXPORT QWebEngineView : public QWidget {
     Q_OBJECT
-// Hack to avoid undefined symbols with properties until we have them implemented.
-#ifndef Q_MOC_RUN
     Q_PROPERTY(QString title READ title)
     Q_PROPERTY(QUrl url READ url WRITE setUrl)
-    Q_PROPERTY(QIcon icon READ icon)
     Q_PROPERTY(QString selectedText READ selectedText)
-    Q_PROPERTY(QString selectedHtml READ selectedHtml)
     Q_PROPERTY(bool hasSelection READ hasSelection)
-    Q_PROPERTY(bool modified READ isModified)
-    //Q_PROPERTY(Qt::TextInteractionFlags textInteractionFlags READ textInteractionFlags WRITE setTextInteractionFlags)
-    Q_PROPERTY(qreal textSizeMultiplier READ textSizeMultiplier WRITE setTextSizeMultiplier DESIGNABLE false)
     Q_PROPERTY(qreal zoomFactor READ zoomFactor WRITE setZoomFactor)
 
-    Q_PROPERTY(QPainter::RenderHints renderHints READ renderHints WRITE setRenderHints)
-    Q_FLAGS(QPainter::RenderHints)
-#endif
-
 public:
     explicit QWebEngineView(QWidget* parent = 0);
     virtual ~QWebEngineView();
@@ -66,45 +51,26 @@ public:
     void setPage(QWebEnginePage* page);
 
     void load(const QUrl& url);
-    void load(const QNetworkRequest& request, QNetworkAccessManager::Operation operation = QNetworkAccessManager::GetOperation, const QByteArray &body = QByteArray());
     void setHtml(const QString& html, const QUrl& baseUrl = QUrl());
     void setContent(const QByteArray& data, const QString& mimeType = QString(), const QUrl& baseUrl = QUrl());
 
     QWebEngineHistory* history() const;
-    QWebEngineSettings* settings() const;
 
     QString title() const;
     void setUrl(const QUrl &url);
     QUrl url() const;
-    QIcon icon() const;
 
     bool hasSelection() const;
     QString selectedText() const;
-    QString selectedHtml() const;
 
 #ifndef QT_NO_ACTION
     QAction* pageAction(QWebEnginePage::WebAction action) const;
 #endif
     void triggerPageAction(QWebEnginePage::WebAction action, bool checked = false);
 
-    bool isModified() const;
-
-    /*
-    Qt::TextInteractionFlags textInteractionFlags() const;
-    void setTextInteractionFlags(Qt::TextInteractionFlags flags);
-    void setTextInteractionFlag(Qt::TextInteractionFlag flag);
-    */
-
     qreal zoomFactor() const;
     void setZoomFactor(qreal factor);
 
-    void setTextSizeMultiplier(qreal factor);
-    qreal textSizeMultiplier() const;
-
-    QPainter::RenderHints renderHints() const;
-    void setRenderHints(QPainter::RenderHints hints);
-    void setRenderHint(QPainter::RenderHint hint, bool enabled = true);
-
     void findText(const QString &subString, QWebEnginePage::FindFlags options = 0, const QWebEngineCallback<bool> &resultCallback = QWebEngineCallback<bool>());
 
     virtual QSize sizeHint() const { return QSize(800, 600); }
@@ -115,17 +81,12 @@ public Q_SLOTS:
     void forward();
     void reload();
 
-    void print(QPrinter*) const { }
-
 Q_SIGNALS:
     void loadStarted();
     void loadProgress(int progress);
     void loadFinished(bool);
     void titleChanged(const QString& title);
-    void statusBarMessage(const QString& text);
-    void linkClicked(const QUrl&);
     void selectionChanged();
-    void iconChanged();
     void urlChanged(const QUrl&);
 
 protected: