diff options
author | Kai Köhne <kai.koehne@qt.io> | 2022-08-30 20:30:26 +0200 |
---|---|---|
committer | Kai Köhne <kai.koehne@qt.io> | 2022-09-23 07:51:15 +0200 |
commit | 45589023cd35f3e616a2047bec76c826f725c88f (patch) | |
tree | 4f18721e8e50aa2fd3a099ecfa479f01fba099ac /examples/multimedia/camera/CMakeLists.txt | |
parent | 7ba5d1f3df45585ee90db5d1c7174203f52c2c05 (diff) |
Let examples show up in Qt Creator again
Fix an issue where the relative paths in the generated
examples-manifest.xml did miss the parent directory, effectively
blocking the examples from being shown in the Qt Creator
Welcome screen.
This broke in commit c403e775f60a, where the exampledirs path
was changed from "../../../examples" to "../../../examples/multimedia"
and "../../../examples/multimediawidgets". This made qdoc miss the
"multimedia" and "multimediawidgets" directories in the generated paths.
To fix this, the patch
* moves all the multimediawidgets examples to multimedia
* sets examplesinstallpath to "multimedia"
The unification of directories is needed because there can be only one
examplesinstallpath per qdoc project.
Fixes: QTBUG-104943
Change-Id: I4d1b1f857563ec23b4d60028ca08d0470ba96298
Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io>
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
(cherry picked from commit c3081f86f4fc53509d853a2b88aff88df8c55d87)
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'examples/multimedia/camera/CMakeLists.txt')
-rw-r--r-- | examples/multimedia/camera/CMakeLists.txt | 81 |
1 files changed, 81 insertions, 0 deletions
diff --git a/examples/multimedia/camera/CMakeLists.txt b/examples/multimedia/camera/CMakeLists.txt new file mode 100644 index 000000000..2c2c2a935 --- /dev/null +++ b/examples/multimedia/camera/CMakeLists.txt @@ -0,0 +1,81 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + +cmake_minimum_required(VERSION 3.16) +project(camera LANGUAGES CXX) + +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTOUIC ON) + +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/multimedia/camera") + +find_package(Qt6 REQUIRED COMPONENTS Core Gui Multimedia MultimediaWidgets Widgets) + +set(camera_form "") +set(videosettings_form "") +if(ANDROID OR IOS) + set(camera_form camera_mobile.ui) + set(videosettings_form videosettings_mobile.ui) +else() + set(camera_form camera.ui) + set(videosettings_form videosettings.ui) +endif() + +qt_add_executable(camera + MANUAL_FINALIZATION + camera.cpp camera.h ${camera_form} + imagesettings.cpp imagesettings.h imagesettings.ui + main.cpp + videosettings.cpp videosettings.h ${videosettings_form} + metadatadialog.cpp metadatadialog.h +) + +set_target_properties(camera PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) + +if(APPLE AND NOT IOS) + set_target_properties(camera PROPERTIES + MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/macos/Info.plist.in" + ) +elseif(IOS) + set_target_properties(camera PROPERTIES + MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/ios/Info.plist.in" + ) +endif() + +set_property(TARGET camera APPEND PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR + ${CMAKE_CURRENT_SOURCE_DIR}/android) + +target_link_libraries(camera PUBLIC + Qt::Core + Qt::Gui + Qt::Multimedia + Qt::MultimediaWidgets + Qt::Widgets +) + +# Resources: +set(camera_resource_files + "images/shutter.svg" +) + +qt_add_resources(camera "camera" + PREFIX + "/" + FILES + ${camera_resource_files} +) + +qt_finalize_executable(camera) + +install(TARGETS camera + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" +) |