5 files changed, 3 insertions, 9 deletions
diff --git a/tests/auto/shared/highdpi.h b/tests/auto/shared/highdpi.h
index 68327f978d..8aa4c8c3d7 100644
--- a/tests/auto/shared/highdpi.h
+++ b/tests/auto/shared/highdpi.h
@@ -1,5 +1,5 @@
 // Copyright (C) 2019 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #ifndef HIGHDPI_H
 #define HIGHDPI_H
diff --git a/tests/auto/shared/platformclipboard.h b/tests/auto/shared/platformclipboard.h
index bc4e797746..1e90f01977 100644
--- a/tests/auto/shared/platformclipboard.h
+++ b/tests/auto/shared/platformclipboard.h
@@ -1,5 +1,5 @@
 // Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #ifndef PLATFORMCLIPBOARD_H
 #define PLATFORMCLIPBOARD_H
diff --git a/tests/auto/shared/platforminputcontext.h b/tests/auto/shared/platforminputcontext.h
index 1c8890d21c..31fa51441d 100644
--- a/tests/auto/shared/platforminputcontext.h
+++ b/tests/auto/shared/platforminputcontext.h
@@ -1,5 +1,5 @@
 // Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #include <qpa/qplatforminputcontext.h>
 
@@ -17,7 +17,6 @@ public:
         m_lastQueries(Qt::ImhNone),
         m_action(QInputMethod::Click),
         m_cursorPosition(0),
-        m_lastEventType(QEvent::None),
         m_setFocusObjectCallCount(0)
     {}
 
@@ -51,10 +50,6 @@ public:
         m_action = action;
         m_cursorPosition = cursorPosition;
     }
-    virtual bool filterEvent(const QEvent *event) override
-    {
-        m_lastEventType = event->type(); return false;
-    }
     virtual void showInputPanel() override
     {
         m_visible = true;
@@ -94,7 +89,6 @@ public:
     Qt::InputMethodQueries m_lastQueries;
     QInputMethod::Action m_action;
     int m_cursorPosition;
-    int m_lastEventType;
     QRectF m_keyboardRect;
     int m_setFocusObjectCallCount;
 };
diff --git a/tests/auto/shared/resources/test.ttf b/tests/auto/shared/resources/test.ttf
index b2bb6cd036..8b56c046d4 100644
--- a/tests/auto/shared/resources/test.ttf
+++ b/tests/auto/shared/resources/test.ttf
diff --git a/tests/auto/shared/resources/testfont_variable.ttf b/tests/auto/shared/resources/testfont_variable.ttf
new file mode 100644
index 0000000000..b3d7be6180
--- /dev/null
+++ b/tests/auto/shared/resources/testfont_variable.ttf