1 files changed, 32 insertions, 16 deletions
diff --git a/examples/virtualkeyboard/basic/CMakeLists.txt b/examples/virtualkeyboard/basic/CMakeLists.txt
index 9958b24b..dc52fbd1 100644
--- a/examples/virtualkeyboard/basic/CMakeLists.txt
+++ b/examples/virtualkeyboard/basic/CMakeLists.txt
@@ -1,28 +1,31 @@
-# Generated from basic.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
-cmake_minimum_required(VERSION 3.14)
+cmake_minimum_required(VERSION 3.16)
 project(basic LANGUAGES CXX)
 
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-
 set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTORCC ON)
-set(CMAKE_AUTOUIC ON)
 
 if(NOT DEFINED INSTALL_EXAMPLESDIR)
-  set(INSTALL_EXAMPLESDIR "examples")
+    set(INSTALL_EXAMPLESDIR "examples")
 endif()
 
 set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/virtualkeyboard/basic")
 
-find_package(Qt6 COMPONENTS Core)
-find_package(Qt6 COMPONENTS Gui)
-find_package(Qt6 COMPONENTS Qml)
-find_package(Qt6 COMPONENTS Quick)
+find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick OPTIONAL_COMPONENTS Multimedia)
+if(QT_FEATURE_static)
+    find_package(Qt6 REQUIRED COMPONENTS Svg)
+endif()
 
-add_qt_gui_executable(basic
+qt_add_executable(basic
     main.cpp
 )
+
+set_target_properties(basic PROPERTIES
+    WIN32_EXECUTABLE TRUE
+    MACOSX_BUNDLE TRUE
+)
+
 target_link_libraries(basic PUBLIC
     Qt::Core
     Qt::Gui
@@ -30,6 +33,10 @@ target_link_libraries(basic PUBLIC
     Qt::Quick
 )
 
+if(TARGET Qt::Multimedia)
+    # See QTBUG-122607
+    target_link_libraries(basic PRIVATE Qt::Multimedia)
+endif()
 
 # Resources:
 set(demo_resource_files
@@ -51,21 +58,30 @@ qt6_add_resources(basic "demo"
         ${demo_resource_files}
 )
 
-if(NOT QT_BUILD_SHARED_LIBS)
-    target_link_libraries(basic PUBLIC
+if(QT_FEATURE_static)
+    target_link_libraries(basic PRIVATE
         Qt::Svg
     )
+    qt_import_plugins(basic
+        INCLUDE Qt::QVirtualKeyboardPlugin
+    )
+endif()
+
+if(ANDROID AND TARGET Qt::Multimedia)
+    qt_import_plugins(basic
+        INCLUDE Qt::QAndroidMediaPlugin
+    )
 endif()
 
 if(NOT QT_FEATURE_vkb_desktop)
     target_compile_definitions(basic PUBLIC
-        MAIN_QML="basic-b2qt.qml" # special case
+        MAIN_QML="basic-b2qt.qml"
     )
 endif()
 
 if(QT_FEATURE_vkb_desktop)
     target_compile_definitions(basic PUBLIC
-        MAIN_QML="Basic.qml" # special case
+        MAIN_QML="Basic.qml"
     )
 endif()