Remove usages of deprecated APIs

- Replaced the following deprecated APIs:

  QWebEngineProfile::setRequestInterceptor -> QWebEngineProfile::setUrlRequestInterceptor
  QWebEngineSettings::globalSettings -> WebEngineSettings::defaultSettings
  QLayout::setMargin -> QLayout::setContentsMargins
  QWheelEvent::{x, y} -> QWheelEvent::position
  QWheelEvent::{globalX, globalY} -> QWheelEvent::globalPosition
  QSysInfo::windowsVersion -> QOperatingSystemVersion::current
  Qt::InputMethodQuery::ImMicroFocus -> Qt::InputMethodQuery::ImCursorRectangle
  QDesktopWidget::screenGeometry -> QGuiApplication::primaryScreen::geometry
  QTime -> QElapsedTimer

- Fixed the tests to compile when deprecated APIs are disabled.

- Replaced the doc references to deprecated APIs with the new ones.
  Made the docs for deprecated APIs compile conditionally, based on
  deprecation version.

Task-number: QTBUG-76491
Change-Id: I5c6b7c628957deb9163f0bd2b6bc31bde1c7daec
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

4 files changed, 6 insertions, 5 deletions

diff --git a/examples/webenginewidgets/simplebrowser/browserwindow.cpp b/examples/webenginewidgets/simplebrowser/browserwindow.cpp
index 2bb9045b0..7b167ded7 100644
--- a/examples/webenginewidgets/simplebrowser/browserwindow.cpp
+++ b/examples/webenginewidgets/simplebrowser/browserwindow.cpp
@@ -100,7 +100,7 @@ BrowserWindow::BrowserWindow(Browser *browser, QWebEngineProfile *profile, bool
     QWidget *centralWidget = new QWidget(this);
     QVBoxLayout *layout = new QVBoxLayout;
     layout->setSpacing(0);
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
     if (!forDevTools) {
         addToolBarBreak();
 
diff --git a/examples/webenginewidgets/simplebrowser/downloadwidget.cpp b/examples/webenginewidgets/simplebrowser/downloadwidget.cpp
index 835a901c6..ddddc5e5d 100644
--- a/examples/webenginewidgets/simplebrowser/downloadwidget.cpp
+++ b/examples/webenginewidgets/simplebrowser/downloadwidget.cpp
@@ -57,8 +57,9 @@
 DownloadWidget::DownloadWidget(QWebEngineDownloadItem *download, QWidget *parent)
     : QFrame(parent)
     , m_download(download)
-    , m_timeAdded(QTime::currentTime())
+    , m_timeAdded()
 {
+    m_timeAdded.start();
     setupUi(this);
     m_dstName->setText(m_download->downloadFileName());
     m_srcUrl->setText(m_download->url().toDisplayString());
diff --git a/examples/webenginewidgets/simplebrowser/downloadwidget.h b/examples/webenginewidgets/simplebrowser/downloadwidget.h
index c08b298bc..c20676aa6 100644
--- a/examples/webenginewidgets/simplebrowser/downloadwidget.h
+++ b/examples/webenginewidgets/simplebrowser/downloadwidget.h
@@ -54,7 +54,7 @@
 #include "ui_downloadwidget.h"
 
 #include <QFrame>
-#include <QTime>
+#include <QElapsedTimer>
 
 QT_BEGIN_NAMESPACE
 class QWebEngineDownloadItem;
@@ -80,7 +80,7 @@ private:
     QString withUnit(qreal bytes);
 
     QWebEngineDownloadItem *m_download;
-    QTime m_timeAdded;
+    QElapsedTimer m_timeAdded;
 };
 
 #endif // DOWNLOADWIDGET_H
diff --git a/examples/webenginewidgets/simplebrowser/webpopupwindow.cpp b/examples/webenginewidgets/simplebrowser/webpopupwindow.cpp
index 19e3b0124..566723e1f 100644
--- a/examples/webenginewidgets/simplebrowser/webpopupwindow.cpp
+++ b/examples/webenginewidgets/simplebrowser/webpopupwindow.cpp
@@ -66,7 +66,7 @@ WebPopupWindow::WebPopupWindow(QWebEngineProfile *profile)
     setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
 
     QVBoxLayout *layout = new QVBoxLayout;
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
     setLayout(layout);
     layout->addWidget(m_urlLineEdit);
     layout->addWidget(m_view);