Cleanup code and clang build warnings

Fix build noise as reported by clang for issues like api deprecation,
unused variables, sign/unsigned mismatch and other non critical issues.

Pick-to: 6.2
Change-Id: I4fba25406eea8170e3283c42e908ae86bd512e3a
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

4 files changed, 14 insertions, 18 deletions

diff --git a/tests/auto/core/origins/tst_origins.cpp b/tests/auto/core/origins/tst_origins.cpp
index ac937037f..1731bee8a 100644
--- a/tests/auto/core/origins/tst_origins.cpp
+++ b/tests/auto/core/origins/tst_origins.cpp
@@ -200,8 +200,9 @@ private:
         if (url.path().startsWith("/qtwebchannel/"))
             pathPrefix = QSL(":");
         QString pathSuffix = url.path();
-        QFile *file = new QFile(pathPrefix + pathSuffix, job);
+        auto file = std::make_unique<QFile>(pathPrefix + pathSuffix, job);
         if (!file->open(QIODevice::ReadOnly)) {
+            qWarning() << "Failed to read data for:" << url << file->errorString();
             job->fail(QWebEngineUrlRequestJob::RequestFailed);
             return;
         }
@@ -210,7 +211,7 @@ private:
             mimeType = QBAL("application/javascript");
         else if (pathSuffix.endsWith(QSL(".css")))
             mimeType = QBAL("text/css");
-        job->reply(mimeType, file);
+        job->reply(mimeType, file.release());
     }
 
     QList<QUrl> m_requests;
diff --git a/tests/auto/quick/qmltests/tst_qmltests.cpp b/tests/auto/quick/qmltests/tst_qmltests.cpp
index 00c6478e9..967cabfec 100644
--- a/tests/auto/quick/qmltests/tst_qmltests.cpp
+++ b/tests/auto/quick/qmltests/tst_qmltests.cpp
@@ -251,22 +251,17 @@ int main(int argc, char **argv)
 
     sigaction(SIGSEGV, &sigAction, 0);
 #endif
-    QScopedPointer<Application> app;
+    QtWebEngineQuick::initialize();
     // Force to use English language for testing due to error message checks
     QLocale::setDefault(QLocale("en"));
 
     static QByteArrayList params = {QByteArrayLiteral("--use-fake-device-for-media-stream")};
-    QList<const char *> w_argv(argc); \
-    for (int i = 0; i < argc; ++i) \
-        w_argv[i] = argv[i]; \
-    for (int i = 0; i < params.size(); ++i) \
-        w_argv.append(params[i].data()); \
-    int w_argc = w_argv.size(); \
-
-    if (!QCoreApplication::instance()) {
-        app.reset(new Application(w_argc, const_cast<char **>(w_argv.data())));
-    }
-    QtWebEngineQuick::initialize();
+    QList<const char *> w_argv(argc);
+    for (int i = 0; i < argc; ++i) w_argv[i] = argv[i];
+    for (int i = 0; i < params.size(); ++i) w_argv.append(params[i].data());
+    int w_argc = w_argv.size();
+    Application app(w_argc, const_cast<char **>(w_argv.data()));
+
     QQuickWebEngineProfile::defaultProfile()->setOffTheRecord(true);
     qmlRegisterType<TempDir>("Test.util", 1, 0, "TempDir");
     qmlRegisterType<TestInputContext>("Test.util", 1, 0, "TestInputContext");
diff --git a/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp b/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp
index 5df9f035f..26ba71ae3 100644
--- a/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp
+++ b/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp
@@ -218,7 +218,7 @@ void tst_QWebEngineScript::loadEvents()
     // Using window.open from JS
     QVERIFY(profile.pages.size() == 1);
     page.load(QUrl("qrc:/resources/test_window_open.html"));
-    QTRY_COMPARE(profile.pages.size(), 2);
+    QTRY_COMPARE(profile.pages.size(), 2u);
     QTRY_COMPARE(profile.pages.front().spy.count(), 1);
     QTRY_COMPARE(profile.pages.back().spy.count(), 1);
     QVERIFY(verifyOrder(profile.pages.front().eval("window.log", QWebEngineScript::MainWorld).toStringList()));
diff --git a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
index d6a945e65..bbd1fbd16 100644
--- a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
+++ b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
@@ -592,6 +592,7 @@ void tst_QWebEngineView::focusInputTypes()
 
 class KeyEventRecordingWidget : public QWidget {
 public:
+    ~KeyEventRecordingWidget() { qDeleteAll(pressEvents); qDeleteAll(releaseEvents); }
     QList<QKeyEvent *> pressEvents;
     QList<QKeyEvent *> releaseEvents;
     void keyPressEvent(QKeyEvent *e) override { pressEvents << e->clone(); }
@@ -1676,11 +1677,10 @@ void tst_QWebEngineView::postData()
 
 void tst_QWebEngineView::inputFieldOverridesShortcuts()
 {
+    QWebEngineView view;
     bool actionTriggered = false;
-    QAction *action = new QAction;
+    QAction *action = new QAction(&view);
     connect(action, &QAction::triggered, [&actionTriggered] () { actionTriggered = true; });
-
-    QWebEngineView view;
     view.addAction(action);
 
     QSignalSpy loadFinishedSpy(&view, SIGNAL(loadFinished(bool)));