5 files changed, 18 insertions, 83 deletions
diff --git a/tests/auto/layoutfilesystem/BLACKLIST b/tests/auto/layoutfilesystem/BLACKLIST
new file mode 100644
index 00000000..0ab84b92
--- /dev/null
+++ b/tests/auto/layoutfilesystem/BLACKLIST
@@ -0,0 +1,3 @@
+# QTBUG-102756
+[layouts]
+android
diff --git a/tests/auto/layoutfilesystem/CMakeLists.txt b/tests/auto/layoutfilesystem/CMakeLists.txt
index b0f9d70e..0232b449 100644
--- a/tests/auto/layoutfilesystem/CMakeLists.txt
+++ b/tests/auto/layoutfilesystem/CMakeLists.txt
@@ -1,18 +1,21 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
 # Generated from layoutfilesystem.pro.
 
 #####################################################################
 ## tst_layoutfilesystem Test:
 #####################################################################
 
-qt_add_test(tst_layoutfilesystem
+qt_internal_add_test(tst_layoutfilesystem
     SOURCES
         ../shared/layouttesthelper.cpp ../shared/layouttesthelper.h
         tst_layoutfilesystem.cpp
     DEFINES
-        SRC_DIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\"
+        SRC_DIR="${CMAKE_CURRENT_SOURCE_DIR}"
     INCLUDE_DIRECTORIES
         ../shared
-    PUBLIC_LIBRARIES
+    LIBRARIES
         Qt::Gui
         Qt::Qml
         Qt::Quick
@@ -24,8 +27,8 @@ qt_add_test(tst_layoutfilesystem
 ## Scopes:
 #####################################################################
 
-qt_extend_target(tst_layoutfilesystem CONDITION static
-    PUBLIC_LIBRARIES
+qt_internal_extend_target(tst_layoutfilesystem CONDITION NOT QT_BUILD_SHARED_LIBS
+    LIBRARIES
         Qt::Svg
 )
 
diff --git a/tests/auto/layoutfilesystem/data/layouts/en_GB/main.qml b/tests/auto/layoutfilesystem/data/layouts/en_GB/main.qml
index e58b8d66..787afd3d 100644
--- a/tests/auto/layoutfilesystem/data/layouts/en_GB/main.qml
+++ b/tests/auto/layoutfilesystem/data/layouts/en_GB/main.qml
@@ -1,34 +1,9 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Pelagicore AB
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 or (at your option) any later version
-** approved by the KDE Free Qt Foundation. The licenses are as published by
-** the Free Software Foundation and appearing in the file LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 Pelagicore AB
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
-import QtQuick 2.0
-import QtQuick.VirtualKeyboard 2.1
+import QtQuick
+import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Components
 
 KeyboardLayout {
     objectName: "en_GB"
diff --git a/tests/auto/layoutfilesystem/layoutfilesystem.pro b/tests/auto/layoutfilesystem/layoutfilesystem.pro
deleted file mode 100644
index 6be71fd5..00000000
--- a/tests/auto/layoutfilesystem/layoutfilesystem.pro
+++ /dev/null
@@ -1,20 +0,0 @@
-CONFIG += testcase
-TARGET = tst_layoutfilesystem
-
-macos:CONFIG -= app_bundle
-
-QT += testlib qml quick
-
-static {
-    QT += svg
-    QTPLUGIN += qtvirtualkeyboardplugin
-}
-
-include(../shared/layouttest.pri)
-
-SOURCES += $$PWD/tst_layoutfilesystem.cpp
-
-OTHER_FILES += \
-    data/layouts/en_GB/main.qml \
-
-DEFINES += SRC_DIR=\\\"$$PWD\\\"
diff --git a/tests/auto/layoutfilesystem/tst_layoutfilesystem.cpp b/tests/auto/layoutfilesystem/tst_layoutfilesystem.cpp
index 1d906712..a18fbea6 100644
--- a/tests/auto/layoutfilesystem/tst_layoutfilesystem.cpp
+++ b/tests/auto/layoutfilesystem/tst_layoutfilesystem.cpp
@@ -1,31 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Pelagicore AB
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 or (at your option) any later version
-** approved by the KDE Free Qt Foundation. The licenses are as published by
-** the Free Software Foundation and appearing in the file LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 Pelagicore AB
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #include "layouttesthelper.h"