Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Herrie/qt6 #7

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Herrie/qt6 #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3ac6a69
org.webosports.app.camera: Update for Qt6
Herrie82 May 20, 2022
f59fdce
FU
Herrie82 May 20, 2022
508a0e8
CMakeLists: remove Qt5 backward compatibility
Tofee May 14, 2023
49b5831
Fix Qt6 syntax for QtConcurrent::Run
Tofee May 14, 2023
ff422ea
AdvancedCameraSettings: migrate code to Qt6's QCamera and QCameraDevice
Tofee May 14, 2023
8305e4a
More Qt6 migration work
Tofee May 18, 2023
6f69bba
CornerShader: try to use vertex shader with QtShaderTool
Tofee May 20, 2023
db5607a
StorageLocations: exit quickly if the /media folder doesn't exist at all
Tofee Jun 23, 2023
dcf0b63
Preferences: go back to the simple list of preferences
Tofee Jun 23, 2023
fbcbee6
CameraView: disable resolution picking for the moment
Tofee Jun 23, 2023
7730c32
Merge pull request #5 from Tofee/tofe/qt6
Herrie82 Jul 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,13 @@ else()
set(CAMERA_OUTPUT_DIR "C:/temp/luneos-camera")
endif()

set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden -Wall -std=c++0x")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden -Wall -std=c++1z")
add_definitions(-DCAMERA_OUTPUT_DIR="${CAMERA_OUTPUT_DIR}")

# Standard install paths. Needs to be set before finding packages.
include(GNUInstallDirs)

find_package(Qt5Qml)
find_package(Qt5Quick)
find_package(Qt5Multimedia)
find_package(Qt5Gui)
find_package(Qt6 REQUIRED COMPONENTS Qml Quick Multimedia Gui ShaderTools)

set(APP_DATA appinfo.json icon.png icon-256x256.png)
set(PLUGIN_DIR ${APP_DIR}/CameraApp)
Expand All @@ -56,4 +53,9 @@ install(DIRECTORY qml DESTINATION ${APP_DIR})
file(GLOB_RECURSE NON_COMPILED_FILES *.qml *.js *.svg *.png *.json *.sci qmldir)
add_custom_target(NON_COMPILED_TARGET ALL SOURCES ${NON_COMPILED_FILES})

qt6_add_shaders(org.webosports.app.camera "camera_shaders"
FILES
"qml/components/cornershader.frag"
)

add_subdirectory(CameraApp)
6 changes: 3 additions & 3 deletions CameraApp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ add_library(camera-qml MODULE ${plugin_SRCS} ${plugin_HDRS})
file(COPY qmldir DESTINATION ${CMAKE_CURRENT_BINARY_DIR})

target_link_libraries(camera-qml
${Qt5Qml_LIBRARIES}
${Qt5Quick_LIBRARIES}
${Qt5Multimedia_LIBRARIES}
${Qt6Qml_LIBRARIES}
${Qt6Quick_LIBRARIES}
${Qt6Multimedia_LIBRARIES}
)

install(TARGETS camera-qml DESTINATION ${PLUGIN_DIR})
Expand Down
Loading