qiurui
/
qtgraphs
mirror of https://github.com/qt/qtgraphs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix build for android 

Fixes: QTBUG-113534
Change-Id: Id1a073c09ecf6234b2bb9dff5001b9f78c09ee1c
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
This commit is contained in:
Tomi Korpipaa 2023-05-12 08:21:26 +03:00
parent 4c6e496b2d
commit 62104e4b15
6 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -12,7 +12,7 @@ project(QtGraphs
)
find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals)
find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS Core OpenGL Quick Qml Gui Widgets QuickTest QuickWidgets Test Quick3D)
find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS Core Quick Gui Widgets QuickTest QuickWidgets Test Quick3D)
macro(assertTargets)
foreach(qtTarget IN ITEMS ${ARGN})
@ -23,6 +23,6 @@ macro(assertTargets)
endforeach()
endmacro()
assertTargets(Gui Widgets OpenGL Quick Qml QuickTest QuickWidgets Test Quick3D)
assertTargets(Gui Widgets Quick QuickTest QuickWidgets Test Quick3D)
qt_build_repo()

5
examples/graphs/axishandling/CMakeLists.txt
View File

@ -18,8 +18,8 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}")
find_package(Qt6 COMPONENTS Core)
find_package(Qt6 COMPONENTS Gui)
find_package(Qt6 COMPONENTS Qml)
find_package(Qt6 COMPONENTS Quick)
find_package(Qt6 COMPONENTS Quick3D)
find_package(Qt6 COMPONENTS Graphs)
qt_add_executable(axishandling
@ -32,14 +32,13 @@ set_target_properties(axishandling PROPERTIES
target_link_libraries(axishandling PUBLIC
Qt::Core
Qt::Gui
Qt::Qml
Qt::Quick
Qt::Quick3D
Qt::Graphs
)
qt6_add_qml_module(axishandling
URI AxisHandling
VERSION 1.0
NO_RESOURCE_TARGET_PATH
SOURCES
customformatter.cpp customformatter.h

8
examples/graphs/bars/CMakeLists.txt
View File

@ -18,8 +18,8 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}")
find_package(Qt6 COMPONENTS Core)
find_package(Qt6 COMPONENTS Gui)
find_package(Qt6 COMPONENTS Qml)
find_package(Qt6 COMPONENTS Quick)
find_package(Qt6 COMPONENTS Quick3D)
find_package(Qt6 COMPONENTS Graphs)
qt_add_executable(bars
@ -29,21 +29,17 @@ set_target_properties(bars PROPERTIES
WIN32_EXECUTABLE TRUE
MACOSX_BUNDLE TRUE
)
target_compile_definitions(bars PUBLIC
QT_DISABLE_DEPRECATED_UP_TO=0x050F00
)
target_link_libraries(bars PUBLIC
Qt::Core
Qt::Gui
Qt::Qml
Qt::Quick
Qt::Quick3D
Qt::Graphs
)
qt6_add_qml_module(bars
URI Bars
VERSION 1.0
NO_RESOURCE_TARGET_PATH
QML_FILES
qml/bars/Axes.qml

5
examples/graphs/scatter/CMakeLists.txt
View File

@ -18,8 +18,8 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}")
find_package(Qt6 COMPONENTS Core)
find_package(Qt6 COMPONENTS Gui)
find_package(Qt6 COMPONENTS Qml)
find_package(Qt6 COMPONENTS Quick)
find_package(Qt6 COMPONENTS Quick3D)
find_package(Qt6 COMPONENTS Graphs)
qt_add_executable(scatter
@ -32,14 +32,13 @@ set_target_properties(scatter PROPERTIES
target_link_libraries(scatter PUBLIC
Qt::Core
Qt::Gui
Qt::Qml
Qt::Quick
Qt::Quick3D
Qt::Graphs
)
qt6_add_qml_module(scatter
URI Scatter
VERSION 1.0
NO_RESOURCE_TARGET_PATH
QML_FILES
qml/scatter/Data.qml

5
examples/graphs/surfacegallery/CMakeLists.txt
View File

@ -18,8 +18,8 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}")
find_package(Qt6 COMPONENTS Core)
find_package(Qt6 COMPONENTS Gui)
find_package(Qt6 COMPONENTS Qml)
find_package(Qt6 COMPONENTS Quick)
find_package(Qt6 COMPONENTS Quick3D)
find_package(Qt6 COMPONENTS Graphs)
qt_add_executable(surfacegallery
@ -32,14 +32,13 @@ set_target_properties(surfacegallery PROPERTIES
target_link_libraries(surfacegallery PUBLIC
Qt::Core
Qt::Gui
Qt::Qml
Qt::Quick
Qt::Quick3D
Qt::Graphs
)
qt6_add_qml_module(surfacegallery
URI SurfaceGallery
VERSION 1.0
NO_RESOURCE_TARGET_PATH
SOURCES
datasource.cpp datasource.h

8
src/graphs/CMakeLists.txt
View File

@ -22,6 +22,7 @@ qt_internal_add_qml_module(Graphs
PAST_MAJOR_VERSIONS 1
DEPENDENCIES
QtQuick
QtQuick3D
QML_FILES
${qml_files}
SOURCES
@ -118,16 +119,15 @@ qt_internal_add_qml_module(Graphs
theme
utils
qml
LIBRARIES
Qt::Quick3DPrivate
Qt::Quick3DRuntimeRenderPrivate
PUBLIC_LIBRARIES
Qt::Core
Qt::Gui
Qt::OpenGL
Qt::Qml
Qt::Quick
Qt::QuickWidgets
Qt::Quick3D
Qt::Quick3DPrivate
Qt::Quick3DRuntimeRenderPrivate
PRIVATE_MODULE_INTERFACE
Qt::Quick3DPrivate
Qt::Quick3DRuntimeRenderPrivate