diff options
Diffstat (limited to 'src/quickcontrols/universal/CMakeLists.txt')
| -rw-r--r-- | src/quickcontrols/universal/CMakeLists.txt | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/src/quickcontrols/universal/CMakeLists.txt b/src/quickcontrols/universal/CMakeLists.txt index 6f5dc1bb25..b9ab5d9aaa 100644 --- a/src/quickcontrols/universal/CMakeLists.txt +++ b/src/quickcontrols/universal/CMakeLists.txt @@ -92,7 +92,9 @@ set_source_files_properties(VerticalHeaderView.qml PROPERTIES QT_QML_SOURCE_VERSIONS "2.15;6.0" ) -qt_internal_add_qml_module(qtquickcontrols2universalstyleplugin +add_subdirectory(impl) + +qt_internal_add_qml_module(QuickControls2Universal URI "QtQuick.Controls.Universal" VERSION "${PROJECT_VERSION}" PAST_MAJOR_VERSIONS 2 @@ -107,7 +109,6 @@ qt_internal_add_qml_module(qtquickcontrols2universalstyleplugin SOURCES qquickuniversalstyle.cpp qquickuniversalstyle_p.h qquickuniversaltheme.cpp qquickuniversaltheme_p.h - qtquickcontrols2universalstyleplugin.cpp QML_FILES ${qml_files} DEFINES @@ -119,11 +120,23 @@ qt_internal_add_qml_module(qtquickcontrols2universalstyleplugin Qt::QmlPrivate Qt::QuickControls2ImplPrivate Qt::QuickControls2Private + Qt::QuickControls2UniversalStyleImpl Qt::QuickPrivate Qt::QuickTemplates2Private + GENERATE_CPP_EXPORTS +) + +target_sources(qtquickcontrols2universalstyleplugin + PRIVATE + qtquickcontrols2universalstyleplugin.cpp ) -qt_internal_add_resource(qtquickcontrols2universalstyleplugin "qtquickcontrols2universalstyleplugin" +target_link_libraries(qtquickcontrols2universalstyleplugin + PRIVATE + Qt::QuickControls2Private +) + +qt_internal_add_resource(QuickControls2Universal "qtquickcontrols2universalstyle" PREFIX "/qt-project.org/imports/QtQuick/Controls/Universal" FILES @@ -145,8 +158,6 @@ qt_internal_add_resource(qtquickcontrols2universalstyleplugin "qtquickcontrols2u "images/rightarrow@4x.png" ) -add_subdirectory(impl) - _qt_internal_add_qml_static_plugin_dependency(qtquickcontrols2universalstyleplugin quickwindow) _qt_internal_add_qml_static_plugin_dependency(qtquickcontrols2universalstyleplugin qtquickcontrols2universalstyleimplplugin) |