11 files changed, 31 insertions, 49 deletions
diff --git a/examples/activeqt/CMakeLists.txt b/examples/activeqt/CMakeLists.txt
index b64c0d0..76a9808 100644
--- a/examples/activeqt/CMakeLists.txt
+++ b/examples/activeqt/CMakeLists.txt
@@ -14,6 +14,3 @@ if(MSVC)
         qt_internal_add_example(simpleqml)
     endif()
 endif()
-if(MINGW OR QT_BUILD_SHARED_LIBS)
-    qt_internal_add_example(mediaplayer)
-endif()
diff --git a/examples/activeqt/activeqt.pro b/examples/activeqt/activeqt.pro
index 8dcceff..251808c 100644
--- a/examples/activeqt/activeqt.pro
+++ b/examples/activeqt/activeqt.pro
@@ -5,9 +5,5 @@ SUBDIRS      += comapp \
                 simple \
                 wrapper
 
-contains(QT_CONFIG, shared):SUBDIRS += mediaplayer
 contains(QT_CONFIG, opengl):!contains(QT_CONFIG, opengles2): SUBDIRS += opengl
 qtHaveModule(quickcontrols2):SUBDIRS += simpleqml
-
-# Other examples need an IDL compiler
-mingw:SUBDIRS = mediaplayer
diff --git a/examples/activeqt/mediaplayer/CMakeLists.txt b/examples/activeqt/mediaplayer/CMakeLists.txt
deleted file mode 100644
index 018708a..0000000
--- a/examples/activeqt/mediaplayer/CMakeLists.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright (C) 2022 The Qt Company Ltd.
-# SPDX-License-Identifier: BSD-3-Clause
-
-cmake_minimum_required(VERSION 3.16)
-project(mediaplayer_activeqt LANGUAGES CXX)
-
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTOUIC ON)
-
-if(NOT DEFINED INSTALL_EXAMPLESDIR)
-    set(INSTALL_EXAMPLESDIR "examples")
-endif()
-
-set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/activeqt/mediaplayer_activeqt")
-
-find_package(Qt6 REQUIRED COMPONENTS AxContainer Core Gui Widgets)
-
-qt_add_executable(mediaplayer_activeqt
-    main.cpp
-    mainwindow.ui
-    mediaaxwidget.h
-)
-
-set_target_properties(mediaplayer_activeqt PROPERTIES
-    WIN32_EXECUTABLE TRUE
-    MACOSX_BUNDLE TRUE
-)
-
-target_link_libraries(mediaplayer_activeqt PUBLIC
-    Qt::AxContainer
-    Qt::Core
-    Qt::Gui
-    Qt::Widgets
-)
-
-install(TARGETS mediaplayer_activeqt
-    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
-    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
-    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
-)
diff --git a/tests/manual/CMakeLists.txt b/tests/manual/CMakeLists.txt
index bf36621..4db4d20 100644
--- a/tests/manual/CMakeLists.txt
+++ b/tests/manual/CMakeLists.txt
@@ -4,4 +4,5 @@
 add_subdirectory(axviewer)
 add_subdirectory(dumpcpp)
 add_subdirectory(hierarchy)
+add_subdirectory(mediaplayer)
 add_subdirectory(testcontrol)
diff --git a/tests/manual/mediaplayer/CMakeLists.txt b/tests/manual/mediaplayer/CMakeLists.txt
new file mode 100644
index 0000000..6f443e7
--- /dev/null
+++ b/tests/manual/mediaplayer/CMakeLists.txt
@@ -0,0 +1,30 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+#####################################################################
+## mediaplayer Binary:
+#####################################################################
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTOUIC ON)
+
+qt_internal_add_manual_test(tst_mediaplayer
+    SOURCES
+        mainwindow.ui
+        mediaaxwidget.h
+        main.cpp
+    INCLUDE_DIRECTORIES
+        ../shared
+    LIBRARIES
+        Qt::AxContainer
+        Qt::Core
+        Qt::Gui
+        Qt::Widgets
+)
+
+set_target_properties(tst_mediaplayer PROPERTIES
+    WIN32_EXECUTABLE TRUE
+    MACOSX_BUNDLE TRUE
+)
diff --git a/examples/activeqt/mediaplayer/doc/images/activeqt-mediaplayer-example.jpg b/tests/manual/mediaplayer/doc/images/activeqt-mediaplayer-example.jpg
index 4839242..4839242 100644
--- a/examples/activeqt/mediaplayer/doc/images/activeqt-mediaplayer-example.jpg
+++ b/tests/manual/mediaplayer/doc/images/activeqt-mediaplayer-example.jpg
diff --git a/examples/activeqt/mediaplayer/doc/src/mediaplayer.qdoc b/tests/manual/mediaplayer/doc/src/mediaplayer.qdoc
index 02b6977..02b6977 100644
--- a/examples/activeqt/mediaplayer/doc/src/mediaplayer.qdoc
+++ b/tests/manual/mediaplayer/doc/src/mediaplayer.qdoc
diff --git a/examples/activeqt/mediaplayer/main.cpp b/tests/manual/mediaplayer/main.cpp
index bedb97f..bedb97f 100644
--- a/examples/activeqt/mediaplayer/main.cpp
+++ b/tests/manual/mediaplayer/main.cpp
diff --git a/examples/activeqt/mediaplayer/mainwindow.ui b/tests/manual/mediaplayer/mainwindow.ui
index b83d392..b83d392 100644
--- a/examples/activeqt/mediaplayer/mainwindow.ui
+++ b/tests/manual/mediaplayer/mainwindow.ui
diff --git a/examples/activeqt/mediaplayer/mediaaxwidget.h b/tests/manual/mediaplayer/mediaaxwidget.h
index 3a49b61..3a49b61 100644
--- a/examples/activeqt/mediaplayer/mediaaxwidget.h
+++ b/tests/manual/mediaplayer/mediaaxwidget.h
diff --git a/examples/activeqt/mediaplayer/mediaplayer.pro b/tests/manual/mediaplayer/mediaplayer.pro
index ad787a3..ad787a3 100644
--- a/examples/activeqt/mediaplayer/mediaplayer.pro
+++ b/tests/manual/mediaplayer/mediaplayer.pro