diff options
author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2021-08-17 15:11:13 +0300 |
---|---|---|
committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2021-08-17 15:29:46 +0300 |
commit | 9192c980fe472ee524338ff49bb6d033a9041ca2 (patch) | |
tree | bf2c6bccb1942860a7592da7861f9a28a67b6669 | |
parent | 035d7a32d24de815eeb773a557ff8396944eafad (diff) |
Rename mediaplayer example to avoid name conflict with QtMultimedia
Both QtInterfaceFramework and QtMultimedia have an example named
mediaplayer, this can cause a cmake error when configuring a super
build of qt5 with qtinterfaceframework being part of that build.
Change-Id: Id3abc436fa1a264ef7746ca8ab77e654ac975b17
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
-rw-r--r-- | examples/ifmedia/mediaplayer/CMakeLists.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/examples/ifmedia/mediaplayer/CMakeLists.txt b/examples/ifmedia/mediaplayer/CMakeLists.txt index 85ba5e86..64ebed1d 100644 --- a/examples/ifmedia/mediaplayer/CMakeLists.txt +++ b/examples/ifmedia/mediaplayer/CMakeLists.txt @@ -1,7 +1,7 @@ # Generated from mediaplayer.pro. cmake_minimum_required(VERSION 3.14) -project(mediaplayer LANGUAGES CXX) +project(qtifmediaplayer LANGUAGES CXX) set(CMAKE_INCLUDE_CURRENT_DIR ON) @@ -21,14 +21,14 @@ find_package(Qt6 COMPONENTS Qml) find_package(Qt6 COMPONENTS Quick) find_package(Qt6 COMPONENTS InterfaceFramework) -qt_add_executable(mediaplayer +qt_add_executable(qtifmediaplayer main.cpp ) -set_target_properties(mediaplayer PROPERTIES +set_target_properties(qtifmediaplayer PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) -target_link_libraries(mediaplayer PUBLIC +target_link_libraries(qtifmediaplayer PUBLIC Qt::Core Qt::Gui Qt::InterfaceFramework @@ -42,14 +42,14 @@ set(qml_resource_files "main.qml" ) -qt6_add_resources(mediaplayer "qml" +qt6_add_resources(qtifmediaplayer "qml" PREFIX "/" FILES ${qml_resource_files} ) -install(TARGETS mediaplayer +install(TARGETS qtifmediaplayer RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" |