Improve examples CMakeLists.txt (II)

- Remove double newline at the end
- Use unversioned Qt commands
- Remove QtC specific hacks

Amends 236eec9cbe3

Pick-to: 6.3
Change-Id: Ia6dc5dc801a9002f9f5740869651c343b714913b
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

1 files changed, 7 insertions, 26 deletions

diff --git a/examples/multimedia/video/mediaplayer/CMakeLists.txt b/examples/multimedia/video/mediaplayer/CMakeLists.txt
index 1c70197af..df62fbee1 100644
--- a/examples/multimedia/video/mediaplayer/CMakeLists.txt
+++ b/examples/multimedia/video/mediaplayer/CMakeLists.txt
@@ -4,36 +4,16 @@ project(mediaplayer LANGUAGES CXX)
 
 set(CMAKE_AUTOMOC ON)
 
-set(CMAKE_CXX_STANDARD 11)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-
 if(NOT DEFINED INSTALL_EXAMPLESDIR)
     set(INSTALL_EXAMPLESDIR "examples")
 endif()
 
 set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/multimedia/video/mediaplayer")
 
-# QtCreator supports the following variables for Android, which are identical to qmake Android variables.
-# Check https://doc.qt.io/qt/deployment-android.html for more information.
-# They need to be set before the find_package(...) calls below.
-
-#if(ANDROID)
-#    set(ANDROID_PACKAGE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/android")
-#    if (ANDROID_ABI STREQUAL "armeabi-v7a")
-#        set(ANDROID_EXTRA_LIBS
-#            ${CMAKE_CURRENT_SOURCE_DIR}/path/to/libcrypto.so
-#            ${CMAKE_CURRENT_SOURCE_DIR}/path/to/libssl.so)
-#    endif()
-#endif()
-
 find_package(Qt6 REQUIRED COMPONENTS Core Quick QuickControls2 Svg)
 
-set(PROJECT_SOURCES
-        main.cpp
-)
-
 qt_add_executable(mediaplayer
-    ${PROJECT_SOURCES}
+    main.cpp
 )
 
 set(resource_files
@@ -49,17 +29,18 @@ set(resource_files
     "Speaker_Icon.svg"
 )
 
-qt6_add_resources(mediaplayer "mediaplayer"
+qt_add_resources(mediaplayer "mediaplayer"
     PREFIX
         "/"
     FILES
         ${resource_files}
 )
 
-target_compile_definitions(mediaplayer
-  PRIVATE $<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:QT_QML_DEBUG>)
-target_link_libraries(mediaplayer
-  PRIVATE Qt6::Core Qt6::Quick Qt6::Svg)
+target_link_libraries(mediaplayer PRIVATE
+    Qt6::Core
+    Qt6::Svg
+    Qt6::Quick
+)
 
 install(TARGETS mediaplayer
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"