diff options
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/components/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/settings/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/styles/CMakeLists.txt | 1 |
4 files changed, 8 insertions, 5 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1551c2b2..747defa4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -4,9 +4,9 @@ # Generated from src.pro. add_subdirectory(virtualkeyboard) +add_subdirectory(settings) add_subdirectory(components) add_subdirectory(layouts) -add_subdirectory(settings) add_subdirectory(styles) add_subdirectory(plugin) add_subdirectory(plugins) diff --git a/src/components/CMakeLists.txt b/src/components/CMakeLists.txt index 1ee450ee..1343b6dc 100644 --- a/src/components/CMakeLists.txt +++ b/src/components/CMakeLists.txt @@ -55,4 +55,6 @@ qt_internal_add_qml_module(qtvkbcomponentsplugin Qt::Gui Qt::Qml Qt::Quick + Qt::VirtualKeyboard + Qt::VirtualKeyboardSettings ) diff --git a/src/settings/CMakeLists.txt b/src/settings/CMakeLists.txt index 08d5f285..9d4f37d0 100644 --- a/src/settings/CMakeLists.txt +++ b/src/settings/CMakeLists.txt @@ -5,7 +5,7 @@ ## qtvkbsettingsplugin Plugin: ##################################################################### -qt_internal_add_qml_module(qtvkbsettingsplugin +qt_internal_add_qml_module(VirtualKeyboardSettings URI "QtQuick.VirtualKeyboard.Settings" VERSION "${PROJECT_VERSION}" PAST_MAJOR_VERSIONS 2 1 @@ -28,17 +28,17 @@ qt_internal_add_qml_module(qtvkbsettingsplugin Qt::VirtualKeyboardPrivate ) -qt_internal_extend_target(qtvkbsettingsplugin CONDITION QT_FEATURE_vkb_no_builtin_style +qt_internal_extend_target(VirtualKeyboardSettings CONDITION QT_FEATURE_vkb_no_builtin_style DEFINES QT_VIRTUALKEYBOARD_DEFAULT_STYLE="" ) -qt_internal_extend_target(qtvkbsettingsplugin CONDITION QT_FEATURE_vkb_retro_style AND NOT QT_FEATURE_vkb_no_builtin_style +qt_internal_extend_target(VirtualKeyboardSettings CONDITION QT_FEATURE_vkb_retro_style AND NOT QT_FEATURE_vkb_no_builtin_style DEFINES QT_VIRTUALKEYBOARD_DEFAULT_STYLE="retro" ) -qt_internal_extend_target(qtvkbsettingsplugin CONDITION NOT QT_FEATURE_vkb_no_builtin_style AND NOT QT_FEATURE_vkb_retro_style +qt_internal_extend_target(VirtualKeyboardSettings CONDITION NOT QT_FEATURE_vkb_no_builtin_style AND NOT QT_FEATURE_vkb_retro_style DEFINES QT_VIRTUALKEYBOARD_DEFAULT_STYLE="default" ) diff --git a/src/styles/CMakeLists.txt b/src/styles/CMakeLists.txt index 8676e4a7..ce8c7791 100644 --- a/src/styles/CMakeLists.txt +++ b/src/styles/CMakeLists.txt @@ -48,4 +48,5 @@ qt_internal_add_qml_module(qtvkbstylesplugin Qt::Qml Qt::Quick Qt::Svg + Qt::VirtualKeyboard ) |