Remove new API added in 5.7

Return the API to what it was in 5.6

Change-Id: I25e7f321802cfd69017120d5645e93c6e0d2fd32
Reviewed-by: Peter Varga <[email protected]>
Reviewed-by: Joerg Bornemann <[email protected]>

Author: Allan Sandfeld Jensen

examples/webengine/quicknanobrowser/BrowserWindow.qml

@@ -84,8 +84,6 @@ ApplicationWindow {
         property alias errorPageEnabled: errorPageEnabled.checked;
         property alias pluginsEnabled: pluginsEnabled.checked;
         property alias fullScreenSupportEnabled: fullScreenSupportEnabled.checked;
-        property alias autoLoadIconsForPage: autoLoadIconsForPage.checked;
-        property alias touchIconsEnabled: touchIconsEnabled.checked;
     }
 
     Action {
@@ -237,7 +235,6 @@ ApplicationWindow {
                         z: 2
                         id: faviconImage
                         width: 16; height: 16
-                        sourceSize: Qt.size(width, height)
                         source: currentWebView && currentWebView.icon
                     }
                     style: TextFieldStyle {
@@ -297,19 +294,6 @@ ApplicationWindow {
                             checked: (currentWebView.profile.httpCacheType == WebEngineProfile.DiskHttpCache)
                             onToggled: currentWebView.profile.httpCacheType = checked ? WebEngineProfile.DiskHttpCache : WebEngineProfile.MemoryHttpCache
                         }
-                        MenuItem {
-                            id: autoLoadIconsForPage
-                            text: "Icons On"
-                            checkable: true
-                            checked: WebEngine.settings.autoLoadIconsForPage
-                        }
-                        MenuItem {
-                            id: touchIconsEnabled
-                            text: "Touch Icons On"
-                            checkable: true
-                            checked: WebEngine.settings.touchIconsEnabled
-                            enabled: autoLoadIconsForPage.checked
-                        }
                     }
                 }
             }
@@ -381,8 +365,6 @@ ApplicationWindow {
                 settings.errorPageEnabled: appSettings.errorPageEnabled
                 settings.pluginsEnabled: appSettings.pluginsEnabled
                 settings.fullScreenSupportEnabled: appSettings.fullScreenSupportEnabled
-                settings.autoLoadIconsForPage: appSettings.autoLoadIconsForPage
-                settings.touchIconsEnabled: appSettings.touchIconsEnabled
 
                 onCertificateError: {
                     error.defer()

examples/webenginewidgets/demobrowser/browserapplication.cpp

@@ -72,6 +72,7 @@
 #include <QtNetwork/QLocalServer>
 #include <QtNetwork/QLocalSocket>
 #include <QtNetwork/QNetworkProxy>
+#include <QtNetwork/QNetworkReply>
 #include <QtNetwork/QSslSocket>
 
 #include <QWebEngineProfile>
@@ -296,21 +297,6 @@ void BrowserApplication::loadSettings()
 
     defaultProfile->setHttpUserAgent(settings.value(QLatin1String("httpUserAgent")).toString());
     defaultProfile->setHttpAcceptLanguage(settings.value(QLatin1String("httpAcceptLanguage")).toString());
-
-    switch (settings.value(QLatin1String("faviconDownloadMode"), 1).toInt()) {
-    case 0:
-        defaultSettings->setAttribute(QWebEngineSettings::AutoLoadIconsForPage, false);
-        break;
-    case 1:
-        defaultSettings->setAttribute(QWebEngineSettings::AutoLoadIconsForPage, true);
-        defaultSettings->setAttribute(QWebEngineSettings::TouchIconsEnabled, false);
-        break;
-    case 2:
-        defaultSettings->setAttribute(QWebEngineSettings::AutoLoadIconsForPage, true);
-        defaultSettings->setAttribute(QWebEngineSettings::TouchIconsEnabled, true);
-        break;
-    }
-
     settings.endGroup();
     settings.beginGroup(QLatin1String("cookies"));
 
@@ -525,6 +511,10 @@ QNetworkAccessManager *BrowserApplication::networkAccessManager()
 {
     if (!s_networkAccessManager) {
         s_networkAccessManager = new QNetworkAccessManager();
+        connect(s_networkAccessManager, &QNetworkAccessManager::authenticationRequired,
+                BrowserApplication::instance(), &BrowserApplication::authenticationRequired);
+        connect(s_networkAccessManager, &QNetworkAccessManager::proxyAuthenticationRequired,
+                BrowserApplication::instance(), &BrowserApplication::proxyAuthenticationRequired);
     }
     return s_networkAccessManager;
 }
@@ -583,3 +573,68 @@ void BrowserApplication::setPrivateBrowsing(bool privateBrowsing)
     }
     emit privateBrowsingChanged(privateBrowsing);
 }
+
+void BrowserApplication::setLastAuthenticator(QAuthenticator *authenticator)
+{
+    m_lastAuthenticator = QAuthenticator(*authenticator);
+}
+
+void BrowserApplication::setLastProxyAuthenticator(QAuthenticator *authenticator)
+{
+    m_lastProxyAuthenticator = QAuthenticator(*authenticator);
+}
+
+void BrowserApplication::authenticationRequired(QNetworkReply *reply, QAuthenticator *authenticator)
+{
+    if (m_lastAuthenticator.isNull())
+        return;
+
+
+    Q_ASSERT(m_lastAuthenticator.option("key").isValid());
+    QByteArray lastKey = m_lastAuthenticator.option("key").toByteArray();
+    QByteArray key = BrowserApplication::authenticationKey(reply->url(), authenticator->realm());
+
+    if (lastKey == key)
+        *authenticator = m_lastAuthenticator;
+}
+
+void BrowserApplication::proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthenticator *authenticator)
+{
+    if (m_lastProxyAuthenticator.isNull())
+        return;
+
+    QNetworkProxy::ProxyType proxyType = proxy.type();
+    if (proxyType != QNetworkProxy::HttpProxy || proxyType != QNetworkProxy::HttpCachingProxy)
+        return;
+
+    Q_ASSERT(m_lastProxyAuthenticator.option("host").isValid());
+    QByteArray lastKey = m_lastProxyAuthenticator.option("key").toByteArray();
+    QByteArray key = BrowserApplication::proxyAuthenticationKey(proxy, authenticator->realm());
+
+    if (lastKey == key)
+        *authenticator = m_lastAuthenticator;
+}
+
+// TODO: Remove these functions (QTBUG-47967)
+QByteArray BrowserApplication::authenticationKey(const QUrl &url, const QString &realm)
+{
+    QUrl copy = url;
+    copy.setFragment(realm);
+    return "auth:" + copy.toEncoded(QUrl::RemovePassword | QUrl::RemovePath | QUrl::RemoveQuery);
+}
+
+QByteArray BrowserApplication::proxyAuthenticationKey(const QNetworkProxy &proxy, const QString &realm)
+{
+    QString host = QString("%1:%2").arg(proxy.hostName()).arg(proxy.port());
+    return BrowserApplication::proxyAuthenticationKey(proxy.user(), host, realm);
+}
+
+QByteArray BrowserApplication::proxyAuthenticationKey(const QString &user, const QString &host, const QString &realm)
+{
+    QUrl key;
+    key.setScheme(QLatin1String("proxy-http"));
+    key.setUserName(user);
+    key.setHost(host);
+    key.setFragment(realm);
+    return "auth:" + key.toEncoded();
+}

examples/webenginewidgets/demobrowser/browserapplication.h

@@ -63,6 +63,8 @@
 QT_BEGIN_NAMESPACE
 class QLocalServer;
 class QNetworkAccessManager;
+class QNetworkProxy;
+class QNetworkReply;
 class QWebEngineProfile;
 QT_END_NAMESPACE
 
@@ -91,6 +93,14 @@ class BrowserApplication : public QApplication
     bool canRestoreSession() const;
     bool privateBrowsing() const { return m_privateBrowsing; }
 
+    void setLastAuthenticator(QAuthenticator *);
+    void setLastProxyAuthenticator(QAuthenticator *);
+
+    // TODO: Remove these functions (QTBUG-47967)
+    static QByteArray authenticationKey(const QUrl &, const QString &);
+    static QByteArray proxyAuthenticationKey(const QNetworkProxy &, const QString &);
+    static QByteArray proxyAuthenticationKey(const QString &, const QString &, const QString &);
+
     static HistoryManager *historyManager();
     static CookieJar *cookieJar();
     static DownloadManager *downloadManager();
@@ -107,6 +117,8 @@ public slots:
     void lastWindowClosed();
     void quitBrowser();
     void setPrivateBrowsing(bool);
+    void authenticationRequired(QNetworkReply *, QAuthenticator *);
+    void proxyAuthenticationRequired(const QNetworkProxy &, QAuthenticator *);
 
 signals:
     void privateBrowsingChanged(bool);

examples/webenginewidgets/demobrowser/browsermainwindow.cpp

@@ -56,7 +56,6 @@
 #include "chasewidget.h"
 #include "downloadmanager.h"
 #include "history.h"
-#include "printtopdfdialog.h"
 #include "settings.h"
 #include "tabwidget.h"
 #include "toolbarsearch.h"
@@ -313,10 +312,8 @@ void BrowserMainWindow::setupMenu()
 #if defined(QWEBENGINEPAGE_PRINT)
     fileMenu->addAction(tr("P&rint Preview..."), this, SLOT(slotFilePrintPreview()));
     fileMenu->addAction(tr("&Print..."), this, SLOT(slotFilePrint()), QKeySequence::Print);
-#endif
-    fileMenu->addAction(tr("&Print to PDF..."), this, SLOT(slotFilePrintToPDF()));
     fileMenu->addSeparator();
-
+#endif
     QAction *action = fileMenu->addAction(tr("Private &Browsing..."), this, SLOT(slotPrivateBrowsing()));
     action->setCheckable(true);
     action->setChecked(BrowserApplication::instance()->privateBrowsing());
@@ -717,36 +714,6 @@ void BrowserMainWindow::slotFilePrint()
 #endif
 }
 
-void BrowserMainWindow::slotHandlePdfPrinted(const QByteArray& result)
-{
-    if (!result.size())
-        return;
-
-    QFile file(m_printerOutputFileName);
-
-    m_printerOutputFileName.clear();
-    if (!file.open(QFile::WriteOnly))
-        return;
-
-    file.write(result.data(), result.size());
-    file.close();
-}
-
-void BrowserMainWindow::slotFilePrintToPDF()
-{
-    if (!currentTab() || !m_printerOutputFileName.isEmpty())
-        return;
-
-    QFileInfo info(QStringLiteral("printout.pdf"));
-    PrintToPdfDialog *dialog = new PrintToPdfDialog(info.absoluteFilePath(), this);
-    dialog->setWindowTitle(tr("Print to PDF"));
-    if (dialog->exec() != QDialog::Accepted || dialog->filePath().isEmpty())
-        return;
-
-    m_printerOutputFileName = dialog->filePath();
-    currentTab()->page()->printToPdf(invoke(this, &BrowserMainWindow::slotHandlePdfPrinted), dialog->pageLayout());
-}
-
 #if defined(QWEBENGINEPAGE_PRINT)
 void BrowserMainWindow::printRequested(QWebEngineFrame *frame)
 {

examples/webenginewidgets/demobrowser/browsermainwindow.h

@@ -109,7 +109,6 @@ private slots:
     void slotFileOpen();
     void slotFilePrintPreview();
     void slotFilePrint();
-    void slotFilePrintToPDF();
     void slotPrivateBrowsing();
     void slotFileSaveAs();
     void slotEditFind();
@@ -138,7 +137,6 @@ private slots:
     void slotOpenActionUrl(QAction *action);
     void slotShowWindow();
     void slotSwapFocus();
-    void slotHandlePdfPrinted(const QByteArray&);
 
 #if defined(QWEBENGINEPAGE_PRINT)
     void printRequested(QWebEngineFrame *frame);
@@ -181,7 +179,6 @@ private slots:
     QIcon m_stopIcon;
 
     QString m_lastSearch;
-    QString m_printerOutputFileName;
     friend class BrowserApplication;
 };
 

examples/webenginewidgets/demobrowser/demobrowser.pro

@@ -15,9 +15,7 @@ FORMS += \
     downloads.ui \
     history.ui \
     passworddialog.ui \
-    printtopdfdialog.ui \
     proxy.ui \
-    savepagedialog.ui \
     settings.ui
 
 HEADERS += \
@@ -33,8 +31,6 @@ HEADERS += \
     fullscreennotification.h \
     history.h \
     modelmenu.h \
-    printtopdfdialog.h \
-    savepagedialog.h \
     searchlineedit.h \
     settings.h \
     squeezelabel.h \
@@ -57,8 +53,6 @@ SOURCES += \
     fullscreennotification.cpp \
     history.cpp \
     modelmenu.cpp \
-    printtopdfdialog.cpp \
-    savepagedialog.cpp \
     searchlineedit.cpp \
     settings.cpp \
     squeezelabel.cpp \