Merge remote-tracking branch 'origin/5.9' into dev

Change-Id: Ida702fd5fa05a32d6cd7fc737aa061da74b675a0

4 files changed, 3 insertions, 26 deletions

diff --git a/examples/webenginewidgets/demobrowser/browserapplication.cpp b/examples/webenginewidgets/demobrowser/browserapplication.cpp
index 32429a675..c3f3ef9b9 100644
--- a/examples/webenginewidgets/demobrowser/browserapplication.cpp
+++ b/examples/webenginewidgets/demobrowser/browserapplication.cpp
@@ -314,7 +314,9 @@ void BrowserApplication::loadSettings()
     settings.endGroup();
     settings.beginGroup(QLatin1String("cookies"));
 
-    QWebEngineProfile::PersistentCookiesPolicy persistentCookiesPolicy = QWebEngineProfile::PersistentCookiesPolicy(settings.value(QLatin1String("persistentCookiesPolicy")).toInt());
+    QWebEngineProfile::PersistentCookiesPolicy persistentCookiesPolicy =
+            QWebEngineProfile::PersistentCookiesPolicy(settings.value(QLatin1String("persistentCookiesPolicy"),
+                                                                      QWebEngineProfile::AllowPersistentCookies).toInt());
     defaultProfile->setPersistentCookiesPolicy(persistentCookiesPolicy);
     QString pdataPath = settings.value(QLatin1String("persistentDataPath")).toString();
     defaultProfile->setPersistentStoragePath(pdataPath);
diff --git a/examples/webenginewidgets/demobrowser/browsermainwindow.cpp b/examples/webenginewidgets/demobrowser/browsermainwindow.cpp
index 327d7a9d3..14d49f7f3 100644
--- a/examples/webenginewidgets/demobrowser/browsermainwindow.cpp
+++ b/examples/webenginewidgets/demobrowser/browsermainwindow.cpp
@@ -109,9 +109,7 @@ BrowserMainWindow::BrowserMainWindow(QWidget *parent, Qt::WindowFlags flags)
     , m_historyForward(0)
     , m_stop(0)
     , m_reload(0)
-#ifndef QT_NO_PRINTER
     , m_currentPrinter(nullptr)
-#endif
 {
     setToolButtonStyle(Qt::ToolButtonFollowStyle);
     setAttribute(Qt::WA_DeleteOnClose, true);
@@ -312,9 +310,7 @@ void BrowserMainWindow::setupMenu()
 #if defined(QWEBENGINEPAGE_PRINT)
     fileMenu->addAction(tr("P&rint Preview..."), this, SLOT(slotFilePrintPreview()));
 #endif
-#ifndef QT_NO_PRINTER
     fileMenu->addAction(tr("&Print..."), this, SLOT(slotFilePrint()), QKeySequence::Print);
-#endif
     fileMenu->addAction(tr("&Print to PDF..."), this, SLOT(slotFilePrintToPDF()));
     fileMenu->addSeparator();
 
@@ -702,23 +698,19 @@ void BrowserMainWindow::slotFileOpen()
 
 void BrowserMainWindow::slotFilePrintPreview()
 {
-#ifndef QT_NO_PRINTPREVIEWDIALOG
     if (!currentTab())
         return;
     QPrintPreviewDialog *dialog = new QPrintPreviewDialog(this);
     connect(dialog, SIGNAL(paintRequested(QPrinter*)),
             currentTab(), SLOT(print(QPrinter*)));
     dialog->exec();
-#endif
 }
 
 void BrowserMainWindow::slotFilePrint()
 {
-#ifndef QT_NO_PRINTER
     if (!currentTab())
         return;
     printRequested(currentTab()->page());
-#endif
 }
 
 void BrowserMainWindow::slotHandlePdfPrinted(const QByteArray& result)
@@ -751,7 +743,6 @@ void BrowserMainWindow::slotFilePrintToPDF()
     currentTab()->page()->printToPdf(invoke(this, &BrowserMainWindow::slotHandlePdfPrinted), dialog->pageLayout());
 }
 
-#ifndef QT_NO_PRINTER
 void BrowserMainWindow::slotHandlePagePrinted(bool result)
 {
     Q_UNUSED(result);
@@ -763,7 +754,6 @@ void BrowserMainWindow::slotHandlePagePrinted(bool result)
 
 void BrowserMainWindow::printRequested(QWebEnginePage *page)
 {
-#ifndef QT_NO_PRINTDIALOG
     if (m_currentPrinter)
         return;
     m_currentPrinter = new QPrinter();
@@ -774,9 +764,7 @@ void BrowserMainWindow::printRequested(QWebEnginePage *page)
         return;
     }
     page->print(m_currentPrinter, invoke(this, &BrowserMainWindow::slotHandlePagePrinted));
-#endif
 }
-#endif
 
 void BrowserMainWindow::slotPrivateBrowsing()
 {
diff --git a/examples/webenginewidgets/demobrowser/browsermainwindow.h b/examples/webenginewidgets/demobrowser/browsermainwindow.h
index 91e1c1d2f..5bbbb2924 100644
--- a/examples/webenginewidgets/demobrowser/browsermainwindow.h
+++ b/examples/webenginewidgets/demobrowser/browsermainwindow.h
@@ -56,9 +56,7 @@
 #include <QtCore/QUrl>
 
 QT_BEGIN_NAMESPACE
-#ifndef QT_NO_PRINTER
 class QPrinter;
-#endif
 class QWebEnginePage;
 QT_END_NAMESPACE
 
@@ -142,10 +140,8 @@ private slots:
     void slotSwapFocus();
     void slotHandlePdfPrinted(const QByteArray&);
 
-#ifndef QT_NO_PRINTER
     void slotHandlePagePrinted(bool result);
     void printRequested(QWebEnginePage *page);
-#endif
     void geometryChangeRequested(const QRect &geometry);
     void updateToolbarActionText(bool visible);
     void updateBookmarksToolbarActionText(bool visible);
@@ -180,9 +176,7 @@ private:
     QAction *m_restoreLastSession;
     QAction *m_addBookmark;
 
-#ifndef QT_NO_PRINTER
     QPrinter *m_currentPrinter;
-#endif
 
     QIcon m_reloadIcon;
     QIcon m_stopIcon;
diff --git a/examples/webenginewidgets/demobrowser/printtopdfdialog.cpp b/examples/webenginewidgets/demobrowser/printtopdfdialog.cpp
index 0f3b1765e..50a8bb91a 100644
--- a/examples/webenginewidgets/demobrowser/printtopdfdialog.cpp
+++ b/examples/webenginewidgets/demobrowser/printtopdfdialog.cpp
@@ -52,10 +52,8 @@
 #include "ui_printtopdfdialog.h"
 
 #include <QtCore/QDir>
-#ifndef QT_NO_PRINTER
 #include <QtPrintSupport/QPageSetupDialog>
 #include <QtPrintSupport/QPrinter>
-#endif // QT_NO_PRINTER
 #include <QtWidgets/QFileDialog>
 
 PrintToPdfDialog::PrintToPdfDialog(const QString &filePath, QWidget *parent) :
@@ -66,11 +64,8 @@ PrintToPdfDialog::PrintToPdfDialog(const QString &filePath, QWidget *parent) :
     ui->setupUi(this);
     setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
     connect(ui->chooseFilePathButton, &QToolButton::clicked, this, &PrintToPdfDialog::onChooseFilePathButtonClicked);
-#ifndef QT_NO_PRINTER
     connect(ui->choosePageLayoutButton, &QToolButton::clicked, this, &PrintToPdfDialog::onChoosePageLayoutButtonClicked);
-#else
     ui->choosePageLayoutButton->hide();
-#endif // QT_NO_PRINTER
     updatePageLayoutLabel();
     setFilePath(filePath);
 }
@@ -82,7 +77,6 @@ PrintToPdfDialog::~PrintToPdfDialog()
 
 void PrintToPdfDialog::onChoosePageLayoutButtonClicked()
 {
-#ifndef QT_NO_PRINTER
     QPrinter printer;
     printer.setPageLayout(currentPageLayout);
 
@@ -92,7 +86,6 @@ void PrintToPdfDialog::onChoosePageLayoutButtonClicked()
     currentPageLayout.setPageSize(printer.pageLayout().pageSize());
     currentPageLayout.setOrientation(printer.pageLayout().orientation());
     updatePageLayoutLabel();
-#endif // QT_NO_PRINTER
 }
 
 void PrintToPdfDialog::onChooseFilePathButtonClicked()