From 49b94b14d3da42f945f6d49a3288c3ede5b98d36 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Thu, 3 Aug 2017 14:23:15 +0200
Subject: Remove support for building with Qt versions < 5.8.0

Change-Id: I2f2ba754111e198298b7d1a595343fcd773e05e5
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
---
 src/webenginewidgets/api/qwebenginehistory.h |  2 --
 src/webenginewidgets/api/qwebenginepage.cpp  | 21 ---------------------
 src/webenginewidgets/api/qwebenginescript.h  |  2 --
 3 files changed, 25 deletions(-)

(limited to 'src/webenginewidgets/api')

diff --git a/src/webenginewidgets/api/qwebenginehistory.h b/src/webenginewidgets/api/qwebenginehistory.h
index 21ebbf41d..33d91d523 100644
--- a/src/webenginewidgets/api/qwebenginehistory.h
+++ b/src/webenginewidgets/api/qwebenginehistory.h
@@ -79,9 +79,7 @@ private:
     friend class QWebEngineHistoryPrivate;
 };
 
-#if QT_VERSION >= QT_VERSION_CHECK(5,6,0)
 Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QWebEngineHistoryItem)
-#endif
 
 class QWebEngineHistoryPrivate;
 class QWEBENGINEWIDGETS_EXPORT QWebEngineHistory {
diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
index 34728834e..178f6ec98 100644
--- a/src/webenginewidgets/api/qwebenginepage.cpp
+++ b/src/webenginewidgets/api/qwebenginepage.cpp
@@ -101,13 +101,8 @@ static const int MaxTooltipLength = 1024;
 static bool printPdfDataOnPrinter(const QByteArray& data, QPrinter& printer)
 {
     if (!data.size()) {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
         qWarning("Failure to print on printer %ls: Print result data is empty.",
                  qUtf16Printable(printer.printerName()));
-#else
-        qWarning("Failure to print on printer %s: Print result data is empty.",
-                 qPrintable(printer.printerName()));
-#endif
         return false;
     }
 
@@ -143,11 +138,7 @@ static bool printPdfDataOnPrinter(const QByteArray& data, QPrinter& printer)
 
     QPainter painter;
     if (!painter.begin(&printer)) {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
         qWarning("Failure to print on printer %ls: Could not open printer for painting.", qUtf16Printable(printer.printerName()));
-#else
-        qWarning("Failure to print on printer %s: Could not open printer for painting.", qPrintable(printer.printerName()));
-#endif
         return false;
     }
 
@@ -2119,11 +2110,7 @@ void QWebEnginePage::printToPdf(const QString &filePath, const QPageLayout &page
     Q_D(const QWebEnginePage);
 #if defined(ENABLE_PRINTING)
     if (d->currentPrinter) {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
         qWarning("Cannot print to PDF while at the same time printing on printer %ls", qUtf16Printable(d->currentPrinter->printerName()));
-#else
-        qWarning("Cannot print to PDF while at the same time printing on printer %s", qPrintable(d->currentPrinter->printerName()));
-#endif
         return;
     }
 #endif // ENABLE_PRINTING
@@ -2152,11 +2139,7 @@ void QWebEnginePage::printToPdf(const QWebEngineCallback<const QByteArray&> &res
 #if defined(ENABLE_PDF)
 #if defined(ENABLE_PRINTING)
     if (d->currentPrinter) {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
         qWarning("Cannot print to PDF while at the same time printing on printer %ls", qUtf16Printable(d->currentPrinter->printerName()));
-#else
-        qWarning("Cannot print to PDF while at the same time printing on printer %s", qPrintable(d->currentPrinter->printerName()));
-#endif
         d->m_callbacks.invokeEmpty(resultCallback);
         return;
     }
@@ -2188,11 +2171,7 @@ void QWebEnginePage::print(QPrinter *printer, const QWebEngineCallback<bool> &re
 #if defined(ENABLE_PDF)
 #if defined(ENABLE_PRINTING)
     if (d->currentPrinter) {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
         qWarning("Cannot print page on printer %ls: Already printing on %ls.", qUtf16Printable(printer->printerName()), qUtf16Printable(d->currentPrinter->printerName()));
-#else
-        qWarning("Cannot print page on printer %s: Already printing on %s.", qPrintable(printer->printerName()), qPrintable(d->currentPrinter->printerName()));
-#endif
         d->m_callbacks.invokeDirectly(resultCallback, false);
         return;
     }
diff --git a/src/webenginewidgets/api/qwebenginescript.h b/src/webenginewidgets/api/qwebenginescript.h
index 34c13e4b7..e3f65ec59 100644
--- a/src/webenginewidgets/api/qwebenginescript.h
+++ b/src/webenginewidgets/api/qwebenginescript.h
@@ -102,9 +102,7 @@ private:
     QSharedDataPointer<QtWebEngineCore::UserScript> d;
 };
 
-#if QT_VERSION >= QT_VERSION_CHECK(5,6,0)
 Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QWebEngineScript)
-#endif
 
 #ifndef QT_NO_DEBUG_STREAM
 QWEBENGINEWIDGETS_EXPORT QDebug operator<<(QDebug, const QWebEngineScript &);
-- 
cgit v1.2.3