Merge remote-tracking branch 'origin/5.8.0' into 5.8

Change-Id: Ifa26409c722bd4eb373b9ced55f5a58132702ad5

2 files changed, 9 insertions, 1 deletions

diff --git a/src/webenginewidgets/api/qtwebenginewidgetsglobal.cpp b/src/webenginewidgets/api/qtwebenginewidgetsglobal.cpp
index bf3514f71..a39c0e483 100644
--- a/src/webenginewidgets/api/qtwebenginewidgetsglobal.cpp
+++ b/src/webenginewidgets/api/qtwebenginewidgetsglobal.cpp
@@ -49,10 +49,13 @@ namespace QtWebEngineCore
 
 QT_BEGIN_NAMESPACE
 
+#ifndef QT_NO_OPENGL
 Q_GUI_EXPORT QOpenGLContext *qt_gl_global_share_context();
+#endif
 
 static void initialize()
 {
+#ifndef QT_NO_OPENGL
     if (QCoreApplication::instance()) {
         //On window/ANGLE, calling QtWebEngine::initialize from DllMain will result in a crash.
         if (!qt_gl_global_share_context()) {
@@ -62,9 +65,9 @@ static void initialize()
         }
         return;
     }
-
     //QCoreApplication is not yet instantiated, ensuring the call will be deferred
     qAddPreRoutine(QtWebEngineCore::initialize);
+#endif // QT_NO_OPENGL
 }
 
 Q_CONSTRUCTOR_FUNCTION(initialize)
diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
index f769ea0f4..16e9438c9 100644
--- a/src/webenginewidgets/api/qwebenginepage.cpp
+++ b/src/webenginewidgets/api/qwebenginepage.cpp
@@ -1957,6 +1957,9 @@ void QWebEnginePage::printToPdf(const QString &filePath, const QPageLayout &page
     }
 #endif
     d->adapter->printToPDF(pageLayout, filePath);
+#else
+    Q_UNUSED(filePath);
+    Q_UNUSED(pageLayout);
 #endif // if defined(ENABLE_PDF)
 }
 
@@ -1990,6 +1993,7 @@ void QWebEnginePage::printToPdf(const QWebEngineCallback<const QByteArray&> &res
     quint64 requestId = d->adapter->printToPDFCallbackResult(pageLayout);
     d->m_callbacks.registerCallback(requestId, resultCallback);
 #else // if defined(ENABLE_PDF)
+    Q_UNUSED(pageLayout);
     d->m_callbacks.invokeEmpty(resultCallback);
 #endif // if defined(ENABLE_PDF)
 }
@@ -2025,6 +2029,7 @@ void QWebEnginePage::print(QPrinter *printer, const QWebEngineCallback<bool> &re
     quint64 requestId = d->adapter->printToPDFCallbackResult(printer->pageLayout(), printer->colorMode() == QPrinter::Color);
     d->m_callbacks.registerCallback(requestId, resultCallback);
 #else // if defined(ENABLE_PDF)
+    Q_UNUSED(printer);
     d->m_callbacks.invokeDirectly(resultCallback, false);
 #endif // if defined(ENABLE_PDF)
 }