diff options
author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-06-16 11:18:37 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-06-17 17:15:27 +0000 |
commit | 3990af60f80f66bec6928a962ec0fb104608b297 (patch) | |
tree | 8ef99fa5e7b6cf5cdd27f2eebd11b65ff6687036 | |
parent | ae1224cca97b70c1b1bff8b12197f5392bfb314d (diff) |
Remove old configure-related files
Remove the configure.json and configure.pri files that
were used for the qmake-based configure.
Remove the .prev_*.cmake files that were a by-product of
configurejson2cmake.py.
Task-number: QTBUG-89536
Change-Id: I2dfb358e7f22f64db15f600d639df633124781cc
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit e24581b767b990620789b1c77a75741de0096c7e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r-- | configure.json | 5 | ||||
-rw-r--r-- | src/virtualkeyboard/.prev_configure.cmake | 432 | ||||
-rw-r--r-- | src/virtualkeyboard/configure.json | 578 | ||||
-rw-r--r-- | src/virtualkeyboard/configure.pri | 181 |
4 files changed, 0 insertions, 1196 deletions
diff --git a/configure.json b/configure.json deleted file mode 100644 index 06bf1afe..00000000 --- a/configure.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "subconfigs": [ - "src/virtualkeyboard" - ] -} diff --git a/src/virtualkeyboard/.prev_configure.cmake b/src/virtualkeyboard/.prev_configure.cmake deleted file mode 100644 index d11fe3d0..00000000 --- a/src/virtualkeyboard/.prev_configure.cmake +++ /dev/null @@ -1,432 +0,0 @@ - - -#### Inputs - -# input vkb-hunspell -set(INPUT_vkb_hunspell "undefined" CACHE STRING "") -set_property(CACHE INPUT_vkb_hunspell PROPERTY STRINGS undefined no 3rdparty system) - - - -#### Libraries - -qt_find_package(Hunspell PROVIDED_TARGETS Hunspell::Hunspell MODULE_NAME virtualkeyboard QMAKE_LIB hunspell) -if((X11_SUPPORTED) OR QT_FIND_ALL_PACKAGES_ALWAYS) - qt_find_package(XCB 1.11 PROVIDED_TARGETS XCB::XCB MODULE_NAME virtualkeyboard QMAKE_LIB xcb) -endif() -if((X11_SUPPORTED) OR QT_FIND_ALL_PACKAGES_ALWAYS) - qt_find_package(XCB COMPONENTS XFIXES PROVIDED_TARGETS XCB::XFIXES MODULE_NAME virtualkeyboard QMAKE_LIB xcb-xfixes) -endif() -qt_add_qmake_lib_dependency(xcb-xfixes xcb) - - -#### Tests - - - -#### Features - -qt_feature("vkb-record-trace-input" PUBLIC - LABEL "Input trace recording" - AUTODETECT false -) -qt_feature("vkb-arrow-keynavigation" PUBLIC - LABEL "Key navigation" - AUTODETECT false -) -qt_feature("vkb-desktop" PUBLIC - LABEL "Desktop integration" - CONDITION NOT cross_compile -) -qt_feature("vkb-xcb" PUBLIC - LABEL "XCB integration" - CONDITION TARGET XCB::XCB AND TARGET XCB::XFIXES -) -qt_feature("vkb-layouts" PUBLIC - LABEL "Built-in layouts" -) -qt_feature("vkb-no-builtin-style" PUBLIC - LABEL "Disable builtin styles" - AUTODETECT OFF - ENABLE INPUT_vkb_style STREQUAL 'none' -) -qt_feature("vkb-retro-style" PUBLIC - LABEL "Retro style as default" - AUTODETECT OFF - ENABLE INPUT_vkb_style STREQUAL 'retro' -) -qt_feature("vkb-default-style" PUBLIC - LABEL "Default style" - AUTODETECT ON - CONDITION NOT QT_FEATURE_vkb_retro_style AND NOT QT_FEATURE_vkb_no_builtin_style - ENABLE INPUT_vkb_style STREQUAL 'default' -) -qt_feature("vkb-sensitive-debug" PRIVATE - LABEL "Sensitive Debug" - AUTODETECT OFF -) -qt_feature("cerence-sdk" PRIVATE - LABEL "Cerence" - CONDITION tests.cerence-sdk OR FIXME -) -qt_feature("cerence-hwr" PRIVATE - LABEL " Handwriting" - CONDITION QT_FEATURE_cerence_hwr_alphabetic OR QT_FEATURE_cerence_hwr_cjk - ENABLE INPUT_vkb_handwriting STREQUAL 'cerence-hwr' - DISABLE INPUT_vkb_handwriting STREQUAL 'no' -) -qt_feature("cerence-hwr-alphabetic" PRIVATE - LABEL " Alphabetic" - CONDITION tests.cerence-hwr-alphabetic OR FIXME -) -qt_feature("cerence-hwr-cjk" PRIVATE - LABEL " CJK" - CONDITION tests.cerence-hwr-cjk OR FIXME -) -qt_feature("vkb-bundle-cerence" PUBLIC - LABEL " Bundle resources" - AUTODETECT OFF -) -qt_feature("vkb-bundle-cerence-hwr" PUBLIC - LABEL " Handwriting" - AUTODETECT OFF - ENABLE QT_FEATURE_vkb_bundle_cerence -) -qt_feature("vkb-bundle-cerence-xt9" PUBLIC - LABEL " XT9" - AUTODETECT OFF - ENABLE QT_FEATURE_vkb_bundle_cerence -) -qt_feature("cerence-xt9" PRIVATE - LABEL " XT9" - CONDITION feature.cerence-sdk AND tests.cerence-xt9 OR FIXME -) -qt_feature("vkb-cerence-xt9-debug" PUBLIC - LABEL " XT9 Debug" - AUTODETECT OFF -) -qt_feature("vkb-cerence-xt9-9key-layouts" PUBLIC - LABEL " XT9 9-key layouts" - AUTODETECT OFF -) -qt_feature("vkb-cerence-static" PUBLIC - LABEL " Static Linking" - AUTODETECT OFF -) -qt_feature("system-hunspell" PRIVATE - LABEL "System Hunspell" - CONDITION Hunspell_FOUND -) -qt_feature("3rdparty-hunspell" PRIVATE - LABEL " Using Hunspell copy from 3rdparty/" - CONDITION VKB_HAVE_3RDPARTY_HUNSPELL - DISABLE INPUT_vkb_hunspell STREQUAL 'no' OR INPUT_vkb_hunspell STREQUAL 'system' -) -qt_feature("hunspell" PRIVATE - LABEL "Hunspell" - CONDITION QT_FEATURE_3rdparty_hunspell OR QT_FEATURE_system_hunspell - DISABLE feature.cerence-xt9 OR FIXME -) -qt_feature("openwnn" PRIVATE - LABEL "OpenWnn" - AUTODETECT ( NOT INPUT_lang_ja_JP STREQUAL 'no' ) - DISABLE feature.cerence-xt9 OR FIXME -) -qt_feature("vkb-myscript" PRIVATE - LABEL "MyScript" - AUTODETECT OFF -) -qt_feature("pinyin" PRIVATE - LABEL "libpinyin" - AUTODETECT ( NOT INPUT_lang_ch_CN STREQUAL 'no' ) - DISABLE feature.cerence-xt9 OR FIXME -) -qt_feature("vkb-no-bundle-pinyin" PRIVATE - LABEL "Disable resource bundle for the pinyin" - AUTODETECT OFF -) -qt_feature("tcime" PRIVATE - LABEL "Traditional Chinese IME (tcime)" - AUTODETECT ( NOT INPUT_lang_ch_TW STREQUAL 'no' ) - CONDITION QT_FEATURE_zhuyin OR QT_FEATURE_cangjie - DISABLE feature.cerence-xt9 OR FIXME -) -qt_feature("vkb-no-bundle-tcime" PRIVATE - LABEL "Disable resource bundle for the tcime" - AUTODETECT OFF -) -qt_feature("zhuyin" PRIVATE - LABEL "Zhuyin" - AUTODETECT ( NOT INPUT_lang_zh_TW STREQUAL 'no' ) - DISABLE feature.cerence-xt9 OR FIXME -) -qt_feature("cangjie" PRIVATE - LABEL "Cangjie" - AUTODETECT ( NOT INPUT_lang_zh_TW STREQUAL 'no' ) - DISABLE feature.cerence-xt9 OR FIXME -) -qt_feature("hangul" PRIVATE - LABEL "Hangul" - AUTODETECT ( NOT INPUT_lang_ko_KR STREQUAL 'no' ) - DISABLE feature.cerence-xt9 OR FIXME -) -qt_feature("thai" PRIVATE - LABEL "Thai" - AUTODETECT ( NOT INPUT_lang_th_TH STREQUAL 'no' ) - DISABLE feature.cerence-xt9 OR FIXME -) -qt_feature("vkb-lang-ar_AR" PRIVATE - LABEL "Arabic" - AUTODETECT ( NOT INPUT_lang_ar_AR STREQUAL 'no' ) -) -qt_feature("vkb-lang-bg_BG" PRIVATE - LABEL "Bulgarian" - AUTODETECT ( NOT INPUT_lang_bg_BG STREQUAL 'no' ) -) -qt_feature("vkb-lang-cs_CZ" PRIVATE - LABEL "Czech" - AUTODETECT ( NOT INPUT_lang_cs_CZ STREQUAL 'no' ) -) -qt_feature("vkb-lang-da_DK" PRIVATE - LABEL "Danish" - AUTODETECT ( NOT INPUT_lang_da_DK STREQUAL 'no' ) -) -qt_feature("vkb-lang-de_DE" PRIVATE - LABEL "German" - AUTODETECT ( NOT INPUT_lang_de_DE STREQUAL 'no' ) -) -qt_feature("vkb-lang-el_GR" PRIVATE - LABEL "Greek" - AUTODETECT ( NOT INPUT_lang_el_GR STREQUAL 'no' ) -) -qt_feature("vkb-lang-en_GB" PRIVATE - LABEL "English GB" - AUTODETECT ( NOT INPUT_lang_en_GB STREQUAL 'no' ) -) -qt_feature("vkb-lang-en_US" PRIVATE - LABEL "English US" - AUTODETECT ( NOT INPUT_lang_en_US STREQUAL 'no' ) -) -qt_feature("vkb-lang-es_ES" PRIVATE - LABEL "Spanish" - AUTODETECT ( NOT INPUT_lang_es_ES STREQUAL 'no' ) -) -qt_feature("vkb-lang-es_MX" PRIVATE - LABEL "Spanish Mexico" - AUTODETECT ( NOT INPUT_lang_es_MX STREQUAL 'no' ) -) -qt_feature("vkb-lang-et_EE" PRIVATE - LABEL "Estonian" - AUTODETECT ( NOT INPUT_lang_et_EE STREQUAL 'no' ) -) -qt_feature("vkb-lang-fa_FA" PRIVATE - LABEL "Farsi" - AUTODETECT ( NOT INPUT_lang_fa_FA STREQUAL 'no' ) -) -qt_feature("vkb-lang-fi_FI" PRIVATE - LABEL "Finnish" - AUTODETECT ( NOT INPUT_lang_fi_FI STREQUAL 'no' ) -) -qt_feature("vkb-lang-fr_CA" PRIVATE - LABEL "French Canada" - AUTODETECT ( NOT INPUT_lang_fr_CA STREQUAL 'no' ) -) -qt_feature("vkb-lang-fr_FR" PRIVATE - LABEL "French France" - AUTODETECT ( NOT INPUT_lang_fr_FR STREQUAL 'no' ) -) -qt_feature("vkb-lang-he_IL" PRIVATE - LABEL "Hebrew" - AUTODETECT ( NOT INPUT_lang_he_IL STREQUAL 'no' ) -) -qt_feature("vkb-lang-hi_IN" PRIVATE - LABEL "Hindi" - AUTODETECT ( NOT INPUT_lang_hi_IN STREQUAL 'no' ) -) -qt_feature("vkb-lang-hr_HR" PRIVATE - LABEL "Croatian" - AUTODETECT ( NOT INPUT_lang_hr_HR STREQUAL 'no' ) -) -qt_feature("vkb-lang-hu_HU" PRIVATE - LABEL "Hungarian" - AUTODETECT ( NOT INPUT_lang_hu_HU STREQUAL 'no' ) -) -qt_feature("vkb-lang-id_ID" PRIVATE - LABEL "Indonesian" - AUTODETECT ( NOT INPUT_lang_id_ID STREQUAL 'no' ) -) -qt_feature("vkb-lang-it_IT" PRIVATE - LABEL "Italian" - AUTODETECT ( NOT INPUT_lang_it_IT STREQUAL 'no' ) -) -qt_feature("vkb-lang-ja_JP" PRIVATE - LABEL "Japanese" - CONDITION QT_FEATURE_openwnn OR QT_FEATURE_cerence_xt9 -) -qt_feature("vkb-lang-ko_KR" PRIVATE - LABEL "Korean" - AUTODETECT ( NOT INPUT_lang_ko_KR STREQUAL 'no' ) -) -qt_feature("vkb-lang-ms_MY" PRIVATE - LABEL "Malay" - AUTODETECT ( NOT INPUT_lang_ms_MY STREQUAL 'no' ) -) -qt_feature("vkb-lang-nb_NO" PRIVATE - LABEL "Norwegian" - AUTODETECT ( NOT INPUT_lang_nb_NO STREQUAL 'no' ) -) -qt_feature("vkb-lang-nl_NL" PRIVATE - LABEL "Dutch" - AUTODETECT ( NOT INPUT_lang_nl_NL STREQUAL 'no' ) -) -qt_feature("vkb-lang-pl_PL" PRIVATE - LABEL "Polish" - AUTODETECT ( NOT INPUT_lang_pl_PL STREQUAL 'no' ) -) -qt_feature("vkb-lang-pt_BR" PRIVATE - LABEL "Portuguese Brazil" - AUTODETECT ( NOT INPUT_lang_pt_BR STREQUAL 'no' ) -) -qt_feature("vkb-lang-pt_PT" PRIVATE - LABEL "Portuguese Portugal" - AUTODETECT ( NOT INPUT_lang_pt_PT STREQUAL 'no' ) -) -qt_feature("vkb-lang-ro_RO" PRIVATE - LABEL "Romanian" - AUTODETECT ( NOT INPUT_lang_ro_RO STREQUAL 'no' ) -) -qt_feature("vkb-lang-ru_RU" PRIVATE - LABEL "Russian" - AUTODETECT ( NOT INPUT_lang_ru_RU STREQUAL 'no' ) -) -qt_feature("vkb-lang-sk_SK" PRIVATE - LABEL "Slovak" - AUTODETECT ( NOT INPUT_lang_sk_SK STREQUAL 'no' ) -) -qt_feature("vkb-lang-sl_SI" PRIVATE - LABEL "Slovenian" - AUTODETECT ( NOT INPUT_lang_sl_SI STREQUAL 'no' ) -) -qt_feature("vkb-lang-sq_AL" PRIVATE - LABEL "Albanian" - AUTODETECT ( NOT INPUT_lang_sq_AL STREQUAL 'no' ) -) -qt_feature("vkb-lang-sr_SP" PRIVATE - LABEL "Serbian" - AUTODETECT ( NOT INPUT_lang_sr_SP STREQUAL 'no' ) -) -qt_feature("vkb-lang-sv_SE" PRIVATE - LABEL "Swedish" - AUTODETECT ( NOT INPUT_lang_sv_SE STREQUAL 'no' ) -) -qt_feature("vkb-lang-th_TH" PRIVATE - LABEL "Thai" - CONDITION QT_FEATURE_thai OR QT_FEATURE_cerence_xt9 -) -qt_feature("vkb-lang-tr_TR" PRIVATE - LABEL "Turkish" - AUTODETECT ( NOT INPUT_lang_tr_TR STREQUAL 'no' ) -) -qt_feature("vkb-lang-uk_UA" PRIVATE - LABEL "Ukrainian" - AUTODETECT ( NOT INPUT_lang_uk_UA STREQUAL 'no' ) -) -qt_feature("vkb-lang-vi_VN" PRIVATE - LABEL "Vietnamese" - AUTODETECT ( NOT INPUT_lang_vi_VN STREQUAL 'no' ) -) -qt_feature("vkb-lang-zh_CN" PRIVATE - LABEL "Simplified Chinese" - AUTODETECT ( NOT INPUT_lang_zh_CN STREQUAL 'no' ) - CONDITION QT_FEATURE_pinyin OR QT_FEATURE_cerence_xt9 -) -qt_feature("vkb-lang-zh_TW" PRIVATE - LABEL "Traditional Chinese" - AUTODETECT ( NOT INPUT_lang_zh_TW STREQUAL 'no' ) - CONDITION QT_FEATURE_tcime OR QT_FEATURE_zhuyin OR QT_FEATURE_cangjie OR QT_FEATURE_cerence_xt9 -) -qt_feature("vkb-lang-zh_HK" PRIVATE - LABEL "HongKong Chinese" - AUTODETECT ( NOT INPUT_lang_zh_HK STREQUAL 'no' ) - CONDITION QT_FEATURE_cerence_xt9 -) -qt_configure_add_summary_section(NAME "Qt Virtualkeyboard") -qt_configure_add_summary_entry(ARGS "vkb-desktop") -qt_configure_add_summary_entry(ARGS "vkb-layouts") -qt_configure_add_summary_entry(ARGS "vkb-arrow-keynavigation") -qt_configure_add_summary_entry(ARGS "vkb-retro-style") -qt_configure_add_summary_entry(ARGS "vkb-sensitive-debug") -qt_configure_add_summary_entry(ARGS "cerence-sdk") -qt_configure_add_summary_entry(ARGS "vkb-cerence-static") -qt_configure_add_summary_entry(ARGS "cerence-hwr") -qt_configure_add_summary_entry(ARGS "cerence-hwr-alphabetic") -qt_configure_add_summary_entry(ARGS "cerence-hwr-cjk") -qt_configure_add_summary_entry(ARGS "cerence-xt9") -qt_configure_add_summary_entry(ARGS "vkb-cerence-xt9-debug") -qt_configure_add_summary_entry(ARGS "vkb-cerence-xt9-9key-layouts") -qt_configure_add_summary_entry(ARGS "vkb-bundle-cerence") -qt_configure_add_summary_entry(ARGS "vkb-bundle-cerence-hwr") -qt_configure_add_summary_entry(ARGS "vkb-bundle-cerence-xt9") -qt_configure_add_summary_entry(ARGS "hunspell") -qt_configure_add_summary_entry(ARGS "3rdparty-hunspell") -qt_configure_add_summary_entry(ARGS "openwnn") -qt_configure_add_summary_entry(ARGS "vkb-myscript") -qt_configure_add_summary_section(NAME "Language support enabled for") -qt_configure_add_summary_entry(ARGS "vkb-lang-ar_AR") -qt_configure_add_summary_entry(ARGS "vkb-lang-bg_BG") -qt_configure_add_summary_entry(ARGS "vkb-lang-cs_CZ") -qt_configure_add_summary_entry(ARGS "vkb-lang-da_DK") -qt_configure_add_summary_entry(ARGS "vkb-lang-de_DE") -qt_configure_add_summary_entry(ARGS "vkb-lang-el_GR") -qt_configure_add_summary_entry(ARGS "vkb-lang-en_GB") -qt_configure_add_summary_entry(ARGS "vkb-lang-en_US") -qt_configure_add_summary_entry(ARGS "vkb-lang-es_ES") -qt_configure_add_summary_entry(ARGS "vkb-lang-es_MX") -qt_configure_add_summary_entry(ARGS "vkb-lang-et_EE") -qt_configure_add_summary_entry(ARGS "vkb-lang-fa_FA") -qt_configure_add_summary_entry(ARGS "vkb-lang-fi_FI") -qt_configure_add_summary_entry(ARGS "vkb-lang-fr_CA") -qt_configure_add_summary_entry(ARGS "vkb-lang-fr_FR") -qt_configure_add_summary_entry(ARGS "vkb-lang-he_IL") -qt_configure_add_summary_entry(ARGS "vkb-lang-hi_IN") -qt_configure_add_summary_entry(ARGS "vkb-lang-hr_HR") -qt_configure_add_summary_entry(ARGS "vkb-lang-hu_HU") -qt_configure_add_summary_entry(ARGS "vkb-lang-id_ID") -qt_configure_add_summary_entry(ARGS "vkb-lang-it_IT") -qt_configure_add_summary_entry(ARGS "vkb-lang-ja_JP") -qt_configure_add_summary_entry(ARGS "vkb-lang-ko_KR") -qt_configure_add_summary_entry(ARGS "vkb-lang-ms_MY") -qt_configure_add_summary_entry(ARGS "vkb-lang-nb_NO") -qt_configure_add_summary_entry(ARGS "vkb-lang-nl_NL") -qt_configure_add_summary_entry(ARGS "vkb-lang-pl_PL") -qt_configure_add_summary_entry(ARGS "vkb-lang-pt_BR") -qt_configure_add_summary_entry(ARGS "vkb-lang-pt_PT") -qt_configure_add_summary_entry(ARGS "vkb-lang-ro_RO") -qt_configure_add_summary_entry(ARGS "vkb-lang-ru_RU") -qt_configure_add_summary_entry(ARGS "vkb-lang-sk_SK") -qt_configure_add_summary_entry(ARGS "vkb-lang-sl_SI") -qt_configure_add_summary_entry(ARGS "vkb-lang-sq_AL") -qt_configure_add_summary_entry(ARGS "vkb-lang-sr_SP") -qt_configure_add_summary_entry(ARGS "vkb-lang-sv_SE") -qt_configure_add_summary_entry(ARGS "vkb-lang-th_TH") -qt_configure_add_summary_entry(ARGS "vkb-lang-tr_TR") -qt_configure_add_summary_entry(ARGS "vkb-lang-uk_UA") -qt_configure_add_summary_entry(ARGS "vkb-lang-vi_VN") -qt_configure_add_summary_entry(ARGS "vkb-lang-zh_CN") -qt_configure_add_summary_entry(ARGS "vkb-lang-zh_TW") -qt_configure_end_summary_section() # end of "Language support enabled for" section -qt_configure_add_summary_section(NAME "Traditional chinese input methods") -qt_configure_add_summary_entry(ARGS "zhuyin") -qt_configure_add_summary_entry(ARGS "cangjie") -qt_configure_end_summary_section() # end of "Traditional chinese input methods" section -qt_configure_end_summary_section() # end of "Qt Virtualkeyboard" section -qt_configure_add_report_entry( - TYPE ERROR - MESSAGE "Cerence HWR SDK could not be found. For more information, see the documentation in 'Building Qt Virtual Keyboard'." - CONDITION INPUT_vkb_handwriting STREQUAL 'cerence-hwr' AND NOT QT_FEATURE_cerence_hwr -) -qt_configure_add_report_entry( - TYPE NOTE - MESSAGE "Hunspell disabled. Spelling correction will not be available." - CONDITION NOT QT_FEATURE_hunspell -) diff --git a/src/virtualkeyboard/configure.json b/src/virtualkeyboard/configure.json deleted file mode 100644 index 73b23d86..00000000 --- a/src/virtualkeyboard/configure.json +++ /dev/null @@ -1,578 +0,0 @@ -{ - "module": "virtualkeyboard", - "testDir": "../../config.tests", - - "commandline": { - "options": { - "vkb-sensitive-debug": "boolean", - "vkb-arrow-keynavigation": "boolean", - "vkb-enable": { "type": "enableLang" }, - "vkb-disable": { "type": "disableLang" }, - "vkb-desktop": "boolean", - "vkb-cangjie": { "type": "boolean", "value": "cangjie" }, - "vkb-zhuyin": { "type": "boolean", "value": "zhuyin" }, - "vkb-hunspell": { "type": "enum", "values": [ "no", "3rdparty", "system" ] }, - "vkb-handwriting": { "type": "optionalString", "values": [ "yes", "no", "cerence-hwr" ] }, - "vkb-cerence-sdk": { "type": "string" }, - "vkb-style": { "type": "string", "values": [ "standard", "retro" , "none"] }, - "vkb-no-bundle-pinyin": "boolean", - "vkb-no-bundle-tcime": "boolean", - "vkb-cerence-static": "boolean", - "vkb-bundle-cerence": "boolean", - "vkb-bundle-cerence-hwr": "boolean", - "vkb-bundle-cerence-xt9": "boolean", - "vkb-cerence-xt9-debug": "boolean", - "vkb-cerence-xt9-9key-layouts": "boolean" - } - }, - - "libraries": { - "hunspell": { - "label": "Hunspell", - "test": "hunspell", - "sources": [ - { "type": "pkgConfig", "args": "hunspell" }, - { "includedir": "/usr/include/hunspell", "libs": "-lhunspell-1.3" } - ] - }, - "xcb": { - "label": "XCB", - "headers": "xcb/xcb.h", - "sources": [ - { "type": "pkgConfig", "args": "xcb" }, - "-lxcb" - ] - }, - "xcb-xfixes": { - "label": "XCB Xfixes", - "headers": "xcb/xfixes.h", - "sources": [ - { "type": "pkgConfig", "args": "xcb-xfixes" }, - "-lxcb-xfixes" - ], - "use": "xcb" - } - }, - - "tests": { - "3rdparty-hunspell": { - "label": "Hunspell copy under 3rdparty/", - "type": "3rdparty-hunspell" - }, - "cerence-sdk": { - "label": "Cerence SDK", - "type": "cerence-sdk" - }, - "cerence-hwr-alphabetic": { - "label": "Cerence HWR Alphabetic Support", - "type": "cerence-hwr-alphabetic" - }, - "cerence-hwr-cjk": { - "label": "Cerence HWR CJK Support", - "type": "cerence-hwr-cjk" - }, - "cerence-xt9": { - "label": "Cerence XT9", - "type": "cerence-xt9" - } - }, - - "features": { - "vkb-record-trace-input": { - "label": "Input trace recording", - "autoDetect": "false", - "output": [ "publicFeature" ] - }, - "vkb-arrow-keynavigation": { - "label": "Key navigation", - "autoDetect": "false", - "output": [ "publicFeature" ] - }, - "vkb-desktop": { - "label": "Desktop integration", - "condition": "!config.cross_compile", - "output": [ "publicFeature" ] - }, - "vkb-xcb": { - "label": "XCB integration", - "condition": "libs.xcb && libs.xcb-xfixes", - "output": [ "publicFeature" ] - }, - "vkb-layouts": { - "label": "Built-in layouts", - "output": [ "publicFeature" ] - }, - "vkb-no-builtin-style": { - "label": "Disable builtin styles", - "autoDetect": false, - "enable": "input.vkb-style == 'none'", - "output": [ "publicFeature" ] - }, - "vkb-retro-style": { - "label": "Retro style as default", - "autoDetect": false, - "enable": "input.vkb-style == 'retro'", - "output": [ "publicFeature" ] - }, - "vkb-default-style": { - "label": "Default style", - "autoDetect": true, - "condition": "!features.vkb-retro-style && !features.vkb-no-builtin-style", - "enable": "input.vkb-style == 'default'", - "output": [ "publicFeature" ] - }, - "vkb-sensitive-debug": { - "label": "Sensitive Debug", - "autoDetect": false, - "output": [ "privateFeature" ] - }, - "cerence-sdk": { - "label": "Cerence", - "condition": "tests.cerence-sdk", - "output": [ "privateFeature" ] - }, - "cerence-hwr": { - "label": " Handwriting", - "enable": "input.vkb-handwriting == 'cerence-hwr'", - "disable": "input.vkb-handwriting == 'no'", - "condition": "features.cerence-hwr-alphabetic || features.cerence-hwr-cjk", - "output": [ "privateFeature" ] - }, - "cerence-hwr-alphabetic": { - "label": " Alphabetic", - "condition": "tests.cerence-hwr-alphabetic", - "output": [ "privateFeature" ] - }, - "cerence-hwr-cjk": { - "label": " CJK", - "condition": "tests.cerence-hwr-cjk", - "output": [ "privateFeature" ] - }, - "vkb-bundle-cerence": { - "label": " Bundle resources", - "autoDetect": false, - "output": [ "publicFeature" ] - }, - "vkb-bundle-cerence-hwr": { - "label": " Handwriting", - "enable": "features.vkb-bundle-cerence", - "autoDetect": false, - "output": [ "publicFeature" ] - }, - "vkb-bundle-cerence-xt9": { - "label": " XT9", - "enable": "features.vkb-bundle-cerence", - "autoDetect": false, - "output": [ "publicFeature" ] - }, - "cerence-xt9": { - "label": " XT9", - "condition": "feature.cerence-sdk && tests.cerence-xt9", - "output": [ "privateFeature" ] - }, - "vkb-cerence-xt9-debug": { - "label": " XT9 Debug", - "autoDetect": false, - "output": [ "publicFeature" ] - }, - "vkb-cerence-xt9-9key-layouts": { - "label": " XT9 9-key layouts", - "autoDetect": false, - "output": [ "publicFeature" ] - }, - "vkb-cerence-static": { - "label": " Static Linking", - "autoDetect": false, - "output": [ "publicFeature" ] - }, - "system-hunspell": { - "label": "System Hunspell", - "condition": "libs.hunspell", - "output": [ "privateFeature" ] - }, - "3rdparty-hunspell": { - "label": " Using Hunspell copy from 3rdparty/", - "disable": "input.vkb-hunspell == 'no' || input.vkb-hunspell == 'system'", - "condition": "tests.3rdparty-hunspell", - "output": [ "privateFeature" ] - }, - "hunspell": { - "label": "Hunspell", - "condition": "features.3rdparty-hunspell || features.system-hunspell", - "disable": "feature.cerence-xt9", - "output": [ "privateFeature" ] - }, - "openwnn": { - "label": "OpenWnn", - "autoDetect": "input.lang-ja_JP != 'no'", - "disable": "feature.cerence-xt9", - "output": [ "privateFeature" ] - }, - "vkb-myscript": { - "label": "MyScript", - "autoDetect": false, - "output": [ "privateFeature" ] - }, - "pinyin": { - "label": "libpinyin", - "autoDetect": "input.lang-ch_CN != 'no'", - "disable": "feature.cerence-xt9", - "output": [ "privateFeature" ] - }, - "vkb-no-bundle-pinyin": { - "label": "Disable resource bundle for the pinyin", - "autoDetect": false, - "output": [ "privateFeature" ] - }, - "tcime": { - "label": "Traditional Chinese IME (tcime)", - "autoDetect": "input.lang-ch_TW != 'no'", - "condition": "features.zhuyin || features.cangjie", - "disable": "feature.cerence-xt9", - "output": [ "privateFeature" ] - }, - "vkb-no-bundle-tcime": { - "label": "Disable resource bundle for the tcime", - "autoDetect": false, - "output": [ "privateFeature" ] - }, - "zhuyin": { - "label": "Zhuyin", - "autoDetect": "input.lang-zh_TW != 'no'", - "disable": "feature.cerence-xt9", - "output": [ "privateFeature" ] - }, - "cangjie": { - "label": "Cangjie", - "autoDetect": "input.lang-zh_TW != 'no'", - "disable": "feature.cerence-xt9", - "output": [ "privateFeature" ] - }, - "hangul": { - "label": "Hangul", - "autoDetect": "input.lang-ko_KR != 'no'", - "disable": "feature.cerence-xt9", - "output": [ "privateFeature" ] - }, - "thai": { - "label": "Thai", - "autoDetect": "input.lang-th_TH != 'no'", - "disable": "feature.cerence-xt9", - "output": [ "privateFeature" ] - }, - "vkb-lang-ar_AR": { - "label": "Arabic", - "autoDetect": "input.lang-ar_AR != 'no'", - "output": [ "privateFeature" ] - }, - "vkb-lang-bg_BG": { - "label": "Bulgarian", - "autoDetect": "input.lang-bg_BG != 'no'", - "output": [ "privateFeature" ] - }, - "vkb-lang-cs_CZ": { - "label": "Czech", - "autoDetect": "input.lang-cs_CZ != 'no'", - "output": [ "privateFeature" ] - }, - "vkb-lang-da_DK": { - "label": "Danish", - "autoDetect": "input.lang-da_DK != 'no'", - "output": [ "privateFeature" ] - }, - "vkb-lang-de_DE": { - "label": "German", - "autoDetect": "input.lang-de_DE != 'no'", - "output": [ "privateFeature" ] - }, - "vkb-lang-el_GR": { - "label": "Greek", - "autoDetect": "input.lang-el_GR != 'no'", - "output": [ "privateFeature" ] - }, - "vkb-lang-en_GB": { - "label": "English GB", - "autoDetect": "input.lang-en_GB != 'no'", - "output": [ "privateFeature" ] - }, - "vkb-lang-en_US": { - "label": "English US", - "autoDetect": "input.lang-en_US != 'no'", - "output": [ "privateFeature" ] - }, - "vkb-lang-es_ES": { - "label": "Spanish", - "autoDetect": "input.lang-es_ES != 'no'", - "output": [ "privateFeature" ] - }, - "vkb-lang-es_MX": { - "label": "Spanish Mexico", - "autoDetect": "input.lang-es_MX != 'no'", - "output": [ "privateFeature" ] - }, - "vkb-lang-et_EE": { - "label": "Estonian", - "autoDetect": "input.lang-et_EE != 'no'", - "output": [ "privateFeature" ] - }, - "vkb-lang-fa_FA": { - "label": "Farsi", - "autoDetect": "input.lang-fa_FA != 'no'", - "output": [ "privateFeature" ] - }, - "vkb-lang-fi_FI": { - "label": "Finnish", - "autoDetect": "input.lang-fi_FI != 'no'", - "output": [ "privateFeature" ] - }, - "vkb-lang-fr_CA": { - "label": "French Canada", - "autoDetect": "input.lang-fr_CA != 'no'", - "output": [ "privateFeature" ] - }, - "vkb-lang-fr_FR": { - "label": "French France", - "autoDetect": "input.lang-fr_FR != 'no'", - "output": [ "privateFeature" ] - }, - "vkb-lang-he_IL": { - "label": "Hebrew", - "autoDetect": "input.lang-he_IL != 'no'", - "output": [ "privateFeature" ] - }, - "vkb-lang-hi_IN": { - "label": "Hindi", - "autoDetect": "input.lang-hi_IN != 'no'", - "output": [ "privateFeature" ] - }, - "vkb-lang-hr_HR": { - "label": "Croatian", - "autoDetect": "input.lang-hr_HR != 'no'", - "output": [ "privateFeature" ] - }, - "vkb-lang-hu_HU": { - "label": "Hungarian", - "autoDetect": "input.lang-hu_HU != 'no'", - "output": [ "privateFeature" ] - }, - "vkb-lang-id_ID": { - "label": "Indonesian", - "autoDetect": "input.lang-id_ID != 'no'", - "output": [ "privateFeature" ] - }, - "vkb-lang-it_IT": { - "label": "Italian", - "autoDetect": "input.lang-it_IT != 'no'", - "output": [ "privateFeature" ] - }, - "vkb-lang-ja_JP": { - "label": "Japanese", - "condition": "features.openwnn || features.cerence-xt9", - "output": [ "privateFeature" ] - }, - "vkb-lang-ko_KR": { - "label": "Korean", - "autoDetect": "input.lang-ko_KR != 'no'", - "output": [ "privateFeature" ] - }, - "vkb-lang-ms_MY": { - "label": "Malay", - "autoDetect": "input.lang-ms_MY != 'no'", - "output": [ "privateFeature" ] - }, - "vkb-lang-nb_NO": { - "label": "Norwegian", - "autoDetect": "input.lang-nb_NO != 'no'", - "output": [ "privateFeature" ] - }, - "vkb-lang-nl_NL": { - "label": "Dutch", - "autoDetect": "input.lang-nl_NL != 'no'", - "output": [ "privateFeature" ] - }, - "vkb-lang-pl_PL": { - "label": "Polish", - "autoDetect": "input.lang-pl_PL != 'no'", - "output": [ "privateFeature" ] - }, - "vkb-lang-pt_BR": { - "label": "Portuguese Brazil", - "autoDetect": "input.lang-pt_BR != 'no'", - "output": [ "privateFeature" ] - }, - "vkb-lang-pt_PT": { - "label": "Portuguese Portugal", - "autoDetect": "input.lang-pt_PT != 'no'", - "output": [ "privateFeature" ] - }, - "vkb-lang-ro_RO": { - "label": "Romanian", - "autoDetect": "input.lang-ro_RO != 'no'", - "output": [ "privateFeature" ] - }, - "vkb-lang-ru_RU": { - "label": "Russian", - "autoDetect": "input.lang-ru_RU != 'no'", - "output": [ "privateFeature" ] - }, - "vkb-lang-sk_SK": { - "label": "Slovak", - "autoDetect": "input.lang-sk_SK != 'no'", - "output": [ "privateFeature" ] - }, - "vkb-lang-sl_SI": { - "label": "Slovenian", - "autoDetect": "input.lang-sl_SI != 'no'", - "output": [ "privateFeature" ] - }, - "vkb-lang-sq_AL": { - "label": "Albanian", - "autoDetect": "input.lang-sq_AL != 'no'", - "output": [ "privateFeature" ] - }, - "vkb-lang-sr_SP": { - "label": "Serbian", - "autoDetect": "input.lang-sr_SP != 'no'", - "output": [ "privateFeature" ] - }, - "vkb-lang-sv_SE": { - "label": "Swedish", - "autoDetect": "input.lang-sv_SE != 'no'", - "output": [ "privateFeature" ] - }, - "vkb-lang-th_TH": { - "label": "Thai", - "condition": "features.thai || features.cerence-xt9", - "output": [ "privateFeature" ] - }, - "vkb-lang-tr_TR": { - "label": "Turkish", - "autoDetect": "input.lang-tr_TR != 'no'", - "output": [ "privateFeature" ] - }, - "vkb-lang-uk_UA": { - "label": "Ukrainian", - "autoDetect": "input.lang-uk_UA != 'no'", - "output": [ "privateFeature" ] - }, - "vkb-lang-vi_VN": { - "label": "Vietnamese", - "autoDetect": "input.lang-vi_VN != 'no'", - "output": [ "privateFeature" ] - }, - "vkb-lang-zh_CN": { - "label": "Simplified Chinese", - "autoDetect": "input.lang-zh_CN != 'no'", - "condition": "features.pinyin || features.cerence-xt9", - "output": [ "privateFeature" ] - }, - "vkb-lang-zh_TW": { - "label": "Traditional Chinese", - "autoDetect": "input.lang-zh_TW != 'no'", - "condition": "features.tcime || features.zhuyin || features.cangjie || features.cerence-xt9", - "output": [ "privateFeature" ] - }, - "vkb-lang-zh_HK": { - "label": "HongKong Chinese", - "autoDetect": "input.lang-zh_HK != 'no'", - "condition": "features.cerence-xt9", - "output": [ "privateFeature" ] - } - }, - - "report": [ - { - "type": "error", - "condition": "input.vkb-handwriting == 'cerence-hwr' && !features.cerence-hwr", - "message": "Cerence HWR SDK could not be found. For more information, see the documentation in 'Building Qt Virtual Keyboard'." - }, - { - "type": "note", - "condition": "!features.hunspell", - "message": "Hunspell disabled. Spelling correction will not be available." - } - ], - - "summary": [ - { - "section": "Qt Virtualkeyboard", - "entries": [ - "vkb-desktop", - "vkb-layouts", - "vkb-arrow-keynavigation", - "vkb-retro-style", - "vkb-sensitive-debug", - "cerence-sdk", - "vkb-cerence-static", - "cerence-hwr", - "cerence-hwr-alphabetic", - "cerence-hwr-cjk", - "cerence-xt9", - "vkb-cerence-xt9-debug", - "vkb-cerence-xt9-9key-layouts", - "vkb-bundle-cerence", - "vkb-bundle-cerence-hwr", - "vkb-bundle-cerence-xt9", - "hunspell", - "3rdparty-hunspell", - "openwnn", - "vkb-myscript", - { - "section": "Language support enabled for", - "entries": [ - "vkb-lang-ar_AR", - "vkb-lang-bg_BG", - "vkb-lang-cs_CZ", - "vkb-lang-da_DK", - "vkb-lang-de_DE", - "vkb-lang-el_GR", - "vkb-lang-en_GB", - "vkb-lang-en_US", - "vkb-lang-es_ES", - "vkb-lang-es_MX", - "vkb-lang-et_EE", - "vkb-lang-fa_FA", - "vkb-lang-fi_FI", - "vkb-lang-fr_CA", - "vkb-lang-fr_FR", - "vkb-lang-he_IL", - "vkb-lang-hi_IN", - "vkb-lang-hr_HR", - "vkb-lang-hu_HU", - "vkb-lang-id_ID", - "vkb-lang-it_IT", - "vkb-lang-ja_JP", - "vkb-lang-ko_KR", - "vkb-lang-ms_MY", - "vkb-lang-nb_NO", - "vkb-lang-nl_NL", - "vkb-lang-pl_PL", - "vkb-lang-pt_BR", - "vkb-lang-pt_PT", - "vkb-lang-ro_RO", - "vkb-lang-ru_RU", - "vkb-lang-sk_SK", - "vkb-lang-sl_SI", - "vkb-lang-sq_AL", - "vkb-lang-sr_SP", - "vkb-lang-sv_SE", - "vkb-lang-th_TH", - "vkb-lang-tr_TR", - "vkb-lang-uk_UA", - "vkb-lang-vi_VN", - "vkb-lang-zh_CN", - "vkb-lang-zh_TW" - ] - }, - { - "section": "Traditional chinese input methods", - "condition": "features.vkb-lang-zh_TW", - "entries": [ - "zhuyin", - "cangjie" - ] - } - ] - } - ] -} diff --git a/src/virtualkeyboard/configure.pri b/src/virtualkeyboard/configure.pri deleted file mode 100644 index 883619d8..00000000 --- a/src/virtualkeyboard/configure.pri +++ /dev/null @@ -1,181 +0,0 @@ -VKB_SOURCE_TREE = $$PWD -VALID_LANGUAGES = \ - ar_AR \ - bg_BG \ - cs_CZ \ - da_DK \ - de_DE \ - el_GR \ - en_GB \ - en_US \ - es_ES \ - es_MX \ - et_EE \ - fa_FA \ - fi_FI \ - fr_CA \ - fr_FR \ - he_IL \ - hi_IN \ - hr_HR \ - hu_HU \ - id_ID \ - it_IT \ - ja_JP \ - ko_KR \ - ms_MY \ - nb_NO \ - nl_NL \ - pl_PL \ - pt_BR \ - pt_PT \ - ro_RO \ - ru_RU \ - sk_SK \ - sl_SI \ - sq_AL \ - sr_SP \ - sv_SE \ - th_TH \ - tr_TR \ - uk_UA \ - vi_VN \ - zh_CN \ - zh_TW - -defineReplace(qtConfGetLanguageList) { - val = $${2} - isEmpty(val): val = $$qtConfGetNextCommandlineArg() - contains(val, "^-.*|[A-Z_]+=.*")|isEmpty(val) { - qtConfAddError("No value supplied to command line option '$$1'.") - return() - } - vals = $$split(val, ',') - for (l, vals) { - languages += $$l - equals(val, "all"): \ - return($$VALID_LANGUAGES) - - !contains(VALID_LANGUAGES, $$l) { - qtConfAddError("Language '$$l' is not supported by the Qt Virtual Keyboard." \ - "The list of valid languages is:" \ - "$$VALID_LANGUAGES"); - return() - } - } - return($$languages) -} - -defineTest(qtConfCommandline_enableLang) { - languages = $$qtConfGetLanguageList($$1, $$2) - - # explicitly disable all languages that are currently not explicitly set - for (l, VALID_LANGUAGES) { - isEmpty(config.input.lang-$${l}) { - config.input.lang-$${l} = "no" - export(config.input.lang-$${l}) - } - } - - for (l, languages) { - config.input.lang-$${l} = "yes" - export(config.input.lang-$${l}) - } -} - -defineTest(qtConfCommandline_disableLang) { - languages = $$qtConfGetLanguageList($$1, $$2) - - for (l, languages) { - config.input.lang-$${l} = "no" - export(config.input.lang-$${l}) - } -} - - -# T9Write tests - -T9WRITE_BASE_DIR = $$VKB_SOURCE_TREE/src/plugins/t9write/3rdparty/t9write/ - -defineTest(t9writeFindSharedLibrary) { - contains(QT_ARCH, arm) { - LIB_DIR = $$T9WRITE_BASE_DIR/lib/arm/shared - } else: linux { - LIB_DIR = $$T9WRITE_BASE_DIR/lib/linux-x86/shared - } else: win32 { - LIB_DIR = $$T9WRITE_BASE_DIR/lib/win32/shared - } else { - return(false) - } - win32 { - result = $$files($$LIB_DIR/$$1/*.obj) - isEmpty(result): result = $$files($$LIB_DIR/$$1/*.lib) - isEmpty(result) { - return(false) - } - } else { - result = $$files($$LIB_DIR/$$1/*.o) - isEmpty(result): result = $$files($$LIB_DIR/$$1/*.so) - isEmpty(result) { - return(false) - } - } - return(true) -} - -defineTest(t9writeFindStaticLibrary) { - contains(QT_ARCH, arm) { - LIB_DIR = $$T9WRITE_BASE_DIR/lib/arm/shared - } else: linux { - LIB_DIR = $$T9WRITE_BASE_DIR/lib/linux-x86/shared - } else: win32 { - LIB_DIR = $$T9WRITE_BASE_DIR/lib/win32/shared - } else { - return(false) - } - win32 { - result = $$files($$LIB_DIR/$$1/*.obj) - isEmpty(result): result = $$files($$LIB_DIR/$$1/*.lib) - isEmpty(result) { - return(false) - } - } else { - result = $$files($$LIB_DIR/$$1/*.o) - isEmpty(result): result = $$files($$LIB_DIR/$$1/*.a) - isEmpty(result) { - return(false) - } - } - return(true) -} - -defineTest(qtConfTest_t9write-alphabetic) { - !exists($${T9WRITE_BASE_DIR}/api/decuma_hwr.h) { - return (false) - } - !t9writeFindStaticLibrary(alphabetic)|!t9writeFindSharedLibrary(alphabetic) { - return (false) - } - return(true) -} - -defineTest(qtConfTest_t9write-cjk) { - !exists($${T9WRITE_BASE_DIR}/api/decuma_hwr_cjk.h) { - return (false) - } - !t9writeFindStaticLibrary(cjk)|!t9writeFindSharedLibrary(cjk) { - return (false) - } - return(true) -} - - -# 3rdpary hunspell support - -defineTest(qtConfTest_3rdpartyHunspell) { - !exists($$VKB_SOURCE_TREE/src/plugins/hunspell/3rdparty/hunspell/hunspell.h): \ - return(false) - !exists($$VKB_SOURCE_TREE/src/plugins/hunspell/3rdparty/hunspell/data): \ - return(false) - return(true) -} |