Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package fcitx5-qt for openSUSE:Factory checked in at 2026-02-09 11:43:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fcitx5-qt (Old) and /work/SRC/openSUSE:Factory/.fcitx5-qt.new.1670 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fcitx5-qt" Mon Feb 9 11:43:10 2026 rev:19 rq:1331806 version:5.1.12 Changes: -------- --- /work/SRC/openSUSE:Factory/fcitx5-qt/fcitx5-qt.changes 2025-10-10 17:16:02.778158346 +0200 +++ /work/SRC/openSUSE:Factory/.fcitx5-qt.new.1670/fcitx5-qt.changes 2026-02-09 11:43:42.974646243 +0100 @@ -1,0 +2,10 @@ +Sat Feb 7 06:34:32 UTC 2026 - Marguerite Su <[email protected]> + +- update to 5.1.12 + * fix build with new Qt6 +- drop patch: + * 0001-Try-new-cmake-style-for-Qt6-76.patch + * 0002-Fix-cmake-for-qt6.patch + * 0003-Migrate-immodule-probing-also-to-GuiPrivate-target.patch + +------------------------------------------------------------------- Old: ---- 0001-Try-new-cmake-style-for-Qt6-76.patch 0002-Fix-cmake-for-qt6.patch 0003-Migrate-immodule-probing-also-to-GuiPrivate-target.patch fcitx5-qt-5.1.10.tar.zst New: ---- fcitx5-qt-5.1.12.tar.zst ----------(Old B)---------- Old:- drop patch: * 0001-Try-new-cmake-style-for-Qt6-76.patch * 0002-Fix-cmake-for-qt6.patch Old: * 0001-Try-new-cmake-style-for-Qt6-76.patch * 0002-Fix-cmake-for-qt6.patch * 0003-Migrate-immodule-probing-also-to-GuiPrivate-target.patch Old: * 0002-Fix-cmake-for-qt6.patch * 0003-Migrate-immodule-probing-also-to-GuiPrivate-target.patch ----------(Old E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fcitx5-qt.spec ++++++ --- /var/tmp/diff_new_pack.lHIOGg/_old 2026-02-09 11:43:43.458666605 +0100 +++ /var/tmp/diff_new_pack.lHIOGg/_new 2026-02-09 11:43:43.462666773 +0100 @@ -1,7 +1,7 @@ # # spec file for package fcitx5-qt # -# Copyright (c) 2025 SUSE LLC +# Copyright (c) 2026 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,17 +29,13 @@ %define build_qt5 1 Name: fcitx5-qt -Version: 5.1.10 +Version: 5.1.12 Release: 0 Summary: Qt library and IM module for fcitx5 License: BSD-3-Clause AND LGPL-2.1-or-later Group: System/I18n/Chinese URL: https://github.com/fcitx/fcitx5-qt Source: https://download.fcitx-im.org/fcitx5/%{name}/%{name}-%{version}.tar.zst -# PATCH-FIX-UPSTREAM -- Qt 6.10 compat -Patch0: 0001-Try-new-cmake-style-for-Qt6-76.patch -Patch1: 0002-Fix-cmake-for-qt6.patch -Patch2: 0003-Migrate-immodule-probing-also-to-GuiPrivate-target.patch BuildRequires: cmake >= 3.16 BuildRequires: extra-cmake-modules BuildRequires: fcitx5-devel ++++++ fcitx5-qt-5.1.10.tar.zst -> fcitx5-qt-5.1.12.tar.zst ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-qt-5.1.10/CMakeLists.txt new/fcitx5-qt-5.1.12/CMakeLists.txt --- old/fcitx5-qt-5.1.10/CMakeLists.txt 2025-06-16 09:21:11.000000000 +0200 +++ new/fcitx5-qt-5.1.12/CMakeLists.txt 2025-12-22 07:18:10.000000000 +0100 @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.16) -project(fcitx5-qt VERSION 5.1.10) +project(fcitx5-qt VERSION 5.1.12) set(FCITX5_QT_VERSION ${PROJECT_VERSION}) set(REQUIRED_QT4_VERSION 4.8.0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-qt-5.1.10/po/LINGUAS new/fcitx5-qt-5.1.12/po/LINGUAS --- old/fcitx5-qt-5.1.10/po/LINGUAS 2025-06-16 09:21:11.000000000 +0200 +++ new/fcitx5-qt-5.1.12/po/LINGUAS 2025-12-22 07:18:10.000000000 +0100 @@ -6,6 +6,7 @@ fr he ja +ka ko ru vi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-qt-5.1.10/po/fr.po new/fcitx5-qt-5.1.12/po/fr.po --- old/fcitx5-qt-5.1.10/po/fr.po 2025-06-16 09:21:11.000000000 +0200 +++ new/fcitx5-qt-5.1.12/po/fr.po 2025-12-22 07:18:10.000000000 +0100 @@ -4,14 +4,15 @@ # # Translators: # roxfr <[email protected]>, 2022 +# Popolon_Github, 2025 # msgid "" msgstr "" "Project-Id-Version: fcitx5-qt\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2023-11-18 20:24+0000\n" +"POT-Creation-Date: 2025-09-11 20:24+0000\n" "PO-Revision-Date: 2017-12-20 02:52+0000\n" -"Last-Translator: roxfr <[email protected]>, 2022\n" +"Last-Translator: Popolon_Github, 2025\n" "Language-Team: French (https://app.transifex.com/fcitx/teams/12005/fr/)\n" "Language: fr\n" "MIME-Version: 1.0\n" @@ -20,159 +21,159 @@ "Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % " "1000000 == 0 ? 1 : 2;\n" -#: qt5/quickphrase-editor/editor.cpp:260 +#: qt6/quickphrase-editor/editor.cpp:262 msgid "%1 is a system file, do you want to delete all phrases instead?" msgstr "" "%1 est un fichier système, voulez-vous supprimer toutes les phrases à la " "place ?" -#. i18n: file: qt5/quickphrase-editor/editor.ui:52 +#. i18n: file: qt6/quickphrase-editor/editor.ui:52 #. i18n: ectx: property (text), widget (QPushButton, addButton) #: rc.cpp:12 #, kde-format msgid "&Add" msgstr "&Ajouter" -#: qt5/guiwrapper/mainwindow.cpp:29 qt6/guiwrapper/mainwindow.cpp:29 +#: qt5/guiwrapper/mainwindow.cpp:32 qt6/guiwrapper/mainwindow.cpp:32 msgid "&Apply" msgstr "&Appliquer" -#. i18n: file: qt5/quickphrase-editor/editor.ui:63 +#. i18n: file: qt6/quickphrase-editor/editor.ui:63 #. i18n: ectx: property (text), widget (QPushButton, batchEditButton) #: rc.cpp:15 #, kde-format msgid "&Batch Edit" msgstr "Éditer &Batch" -#: qt5/guiwrapper/mainwindow.cpp:31 qt6/guiwrapper/mainwindow.cpp:31 +#: qt5/guiwrapper/mainwindow.cpp:34 qt6/guiwrapper/mainwindow.cpp:34 msgid "&Close" msgstr "&Fermer" -#. i18n: file: qt5/quickphrase-editor/editor.ui:74 +#. i18n: file: qt6/quickphrase-editor/editor.ui:74 #. i18n: ectx: property (text), widget (QPushButton, deleteButton) #: rc.cpp:18 #, kde-format msgid "&Delete" msgstr "&Supprimer" -#. i18n: file: qt5/quickphrase-editor/editor.ui:103 +#. i18n: file: qt6/quickphrase-editor/editor.ui:103 #. i18n: ectx: property (text), widget (QPushButton, importButton) #: rc.cpp:24 #, kde-format msgid "&Import" msgstr "&Importer" -#: qt5/guiwrapper/mainwindow.cpp:28 qt6/guiwrapper/mainwindow.cpp:28 +#: qt5/guiwrapper/mainwindow.cpp:31 qt6/guiwrapper/mainwindow.cpp:31 msgid "&Ok" msgstr "&OK" -#. i18n: file: qt5/quickphrase-editor/editor.ui:45 +#. i18n: file: qt6/quickphrase-editor/editor.ui:45 #. i18n: ectx: property (text), widget (QPushButton, operationButton) #: rc.cpp:9 #, kde-format msgid "&Operation" msgstr "&Opération" -#: qt5/guiwrapper/mainwindow.cpp:30 qt6/guiwrapper/mainwindow.cpp:30 +#: qt5/guiwrapper/mainwindow.cpp:33 qt6/guiwrapper/mainwindow.cpp:33 msgid "&Reset" msgstr "&Réinitialiser" -#: qt5/guiwrapper/wrapperapp.cpp:31 qt6/guiwrapper/wrapperapp.cpp:31 +#: qt5/guiwrapper/wrapperapp.cpp:34 qt6/guiwrapper/wrapperapp.cpp:34 msgid "A launcher for Fcitx Gui plugin." msgstr "Un lanceur pour le plugin Fcitx Gui." -#: qt5/quickphrase-editor/editor.cpp:33 +#: qt6/quickphrase-editor/editor.cpp:35 msgid "Add File" msgstr "Ajouter un fichier" -#: qt5/quickphrase-editor/editor.cpp:272 +#: qt6/quickphrase-editor/editor.cpp:274 msgid "Are you sure to delete %1?" msgstr "Êtes-vous sûr de vouloir supprimer %1 ?" -#. i18n: file: qt5/quickphrase-editor/batchdialog.ui:14 +#. i18n: file: qt6/quickphrase-editor/batchdialog.ui:14 #. i18n: ectx: property (windowTitle), widget (QDialog, BatchDialog) #: rc.cpp:3 #, kde-format msgid "Batch editing" msgstr "Édition par lots" -#: qt5/quickphrase-editor/editor.cpp:238 +#: qt6/quickphrase-editor/editor.cpp:240 msgid "Cannot create file %1." msgstr "Impossible de créer le fichier %1." -#: qt5/quickphrase-editor/editor.cpp:259 +#: qt6/quickphrase-editor/editor.cpp:261 msgid "Cannot remove system file" msgstr "Impossible de supprimer le fichier système" -#: qt5/guiwrapper/wrapperapp.cpp:37 qt6/guiwrapper/wrapperapp.cpp:37 +#: qt5/guiwrapper/wrapperapp.cpp:40 qt6/guiwrapper/wrapperapp.cpp:40 msgid "Config path" msgstr "Chemin de configuration" -#: qt5/quickphrase-editor/editor.cpp:271 +#: qt6/quickphrase-editor/editor.cpp:273 msgid "Confirm deletion" msgstr "Confirmer la suppression" -#: qt5/quickphrase-editor/editor.cpp:221 +#: qt6/quickphrase-editor/editor.cpp:223 msgid "Create new file" msgstr "Créer un nouveau fichier" -#. i18n: file: qt5/quickphrase-editor/editor.ui:85 +#. i18n: file: qt6/quickphrase-editor/editor.ui:85 #. i18n: ectx: property (text), widget (QPushButton, clearButton) #: rc.cpp:21 #, kde-format msgid "De&lete All" msgstr "Tout &supprimer" -#: qt5/quickphrase-editor/filelistmodel.cpp:29 +#: qt6/quickphrase-editor/filelistmodel.cpp:35 msgid "Default" msgstr "Par défaut" -#. i18n: file: qt5/quickphrase-editor/editor.ui:114 +#. i18n: file: qt6/quickphrase-editor/editor.ui:114 #. i18n: ectx: property (text), widget (QPushButton, exportButton) #: rc.cpp:27 #, kde-format msgid "E&xport" msgstr "E&xporter" -#: qt5/widgetsaddons/fcitxqtkeysequencewidget.cpp:355 -#: qt6/widgetsaddons/fcitxqtkeysequencewidget.cpp:324 +#: qt5/widgetsaddons/fcitxqtkeysequencewidget.cpp:353 +#: qt6/widgetsaddons/fcitxqtkeysequencewidget.cpp:322 msgid "Empty" msgstr "Vide" -#: qt5/quickphrase-editor/editor.cpp:280 +#: qt6/quickphrase-editor/editor.cpp:282 msgid "Error while deleting %1." msgstr "Erreur lors de la suppression de %1." -#: qt5/guiwrapper/mainwindow.cpp:106 qt6/guiwrapper/mainwindow.cpp:106 +#: qt5/guiwrapper/mainwindow.cpp:109 qt6/guiwrapper/mainwindow.cpp:109 msgid "Failed to notify Fcitx" msgstr "Échec de la notification à Fcitx" -#: qt5/guiwrapper/mainwindow.cpp:107 qt6/guiwrapper/mainwindow.cpp:107 +#: qt5/guiwrapper/mainwindow.cpp:110 qt6/guiwrapper/mainwindow.cpp:110 msgid "Failed to notify Fcitx about the configuration change." msgstr "Échec de notification à Fcitx du changement de configuration." -#: qt5/guiwrapper/org.fcitx.fcitx5-qt5-gui-wrapper.desktop.in.in:3 +#: qt5/guiwrapper/org.fcitx.fcitx5-qt5-gui-wrapper.desktop.in.in:2 msgid "Fcitx 5 Qt5 Gui Wrapper" -msgstr "Fcitx 5 Qt5 Gui Wrapper" +msgstr "Adaptateur Qt5 GUI pour Fcitx5" -#: qt6/guiwrapper/org.fcitx.fcitx5-qt6-gui-wrapper.desktop.in.in:3 +#: qt6/guiwrapper/org.fcitx.fcitx5-qt6-gui-wrapper.desktop.in.in:2 msgid "Fcitx 5 Qt6 Gui Wrapper" -msgstr "" +msgstr "Adaptateur Qt6 GUI pour Fcitx5" -#: qt5/quickphrase-editor/editor.cpp:237 qt5/quickphrase-editor/editor.cpp:279 +#: qt6/quickphrase-editor/editor.cpp:239 qt6/quickphrase-editor/editor.cpp:281 msgid "File Operation Failed" msgstr "Échec de l'opération de fichier" -#: qt5/quickphrase-editor/editor.cpp:226 +#: qt6/quickphrase-editor/editor.cpp:228 msgid "File name should not contain '/'." msgstr "Le nom du fichier ne doit pas contenir '/'." -#: qt5/guiwrapper/org.fcitx.fcitx5-qt5-gui-wrapper.desktop.in.in:4 -#: qt6/guiwrapper/org.fcitx.fcitx5-qt6-gui-wrapper.desktop.in.in:4 +#: qt5/guiwrapper/org.fcitx.fcitx5-qt5-gui-wrapper.desktop.in.in:3 +#: qt6/guiwrapper/org.fcitx.fcitx5-qt6-gui-wrapper.desktop.in.in:3 msgid "Input Method Configuration helper" -msgstr "Aide à la configuration de la méthode d'entrée" +msgstr "Aide à la configuration de la méthode de saisie" -#: qt5/quickphrase-editor/editor.cpp:225 +#: qt6/quickphrase-editor/editor.cpp:227 msgid "Invalid filename" msgstr "Nom de fichier invalide" @@ -181,48 +182,48 @@ msgid "Key code mode" msgstr "Mode code clé" -#: qt5/quickphrase-editor/model.cpp:73 +#: qt6/quickphrase-editor/model.cpp:83 msgid "Keyword" msgstr "Mot clé" -#: qt5/guiwrapper/org.fcitx.fcitx5-qt5-gui-wrapper.desktop.in.in:5 -#: qt6/guiwrapper/org.fcitx.fcitx5-qt6-gui-wrapper.desktop.in.in:5 +#: qt5/guiwrapper/org.fcitx.fcitx5-qt5-gui-wrapper.desktop.in.in:4 +#: qt6/guiwrapper/org.fcitx.fcitx5-qt6-gui-wrapper.desktop.in.in:4 msgid "Load configuration plugin for Fcitx Addon" -msgstr "Charger le plugin de configuration pour Fcitx Addon" +msgstr "Charger le plugin de configuration pour les extensions Fcitx" -#: qt5/guiwrapper/wrapperapp.cpp:34 qt6/guiwrapper/wrapperapp.cpp:34 +#: qt5/guiwrapper/wrapperapp.cpp:37 qt6/guiwrapper/wrapperapp.cpp:37 msgid "Parent window ID" msgstr "ID de la fenêtre parente" -#: qt5/quickphrase-editor/model.cpp:75 +#: qt6/quickphrase-editor/model.cpp:86 msgid "Phrase" msgstr "Phrase" -#: qt5/quickphrase-editor/editor.cpp:221 +#: qt6/quickphrase-editor/editor.cpp:223 msgid "Please input a filename for newfile" msgstr "Veuillez saisir un nom de fichier pour le nouveau fichier" -#: qt5/quickphrase-editor/editor.cpp:101 +#: qt6/quickphrase-editor/editor.cpp:103 msgid "Quick Phrase Editor" msgstr "Éditeur de phrase rapide" -#: qt5/quickphrase-editor/editor.cpp:37 +#: qt6/quickphrase-editor/editor.cpp:39 msgid "Refresh List" msgstr "Actualiser la liste" -#: qt5/quickphrase-editor/editor.cpp:35 +#: qt6/quickphrase-editor/editor.cpp:37 msgid "Remove File" msgstr "Supprimer le fichier" -#: qt5/quickphrase-editor/editor.cpp:85 +#: qt6/quickphrase-editor/editor.cpp:87 msgid "Save Changes" msgstr "Enregistrer les modifications" -#: qt5/guiwrapper/wrapperapp.cpp:35 qt6/guiwrapper/wrapperapp.cpp:35 +#: qt5/guiwrapper/wrapperapp.cpp:38 qt6/guiwrapper/wrapperapp.cpp:38 msgid "Test if config exists" msgstr "Tester si la configuration existe" -#: qt5/quickphrase-editor/editor.cpp:86 +#: qt6/quickphrase-editor/editor.cpp:88 msgid "" "The content has changed.\n" "Do you want to save the changes or discard them?" @@ -230,28 +231,28 @@ "Le contenu a changé.\n" "Voulez-vous enregistrer les modifications ou les annuler ?" -#: qt5/widgetsaddons/fcitxqtkeysequencewidget.cpp:392 -#: qt6/widgetsaddons/fcitxqtkeysequencewidget.cpp:361 +#: qt5/widgetsaddons/fcitxqtkeysequencewidget.cpp:390 +#: qt6/widgetsaddons/fcitxqtkeysequencewidget.cpp:359 msgid "The key you just pressed is not supported by Qt." msgstr "" "La touche que vous venez d'appuyer n'est pas prise en charge par Qt." -#: qt5/widgetsaddons/fcitxqtkeysequencewidget.cpp:393 -#: qt6/widgetsaddons/fcitxqtkeysequencewidget.cpp:362 +#: qt5/widgetsaddons/fcitxqtkeysequencewidget.cpp:391 +#: qt6/widgetsaddons/fcitxqtkeysequencewidget.cpp:360 msgid "Unsupported Key" msgstr "Clé non prise en charge" -#. i18n: file: qt5/quickphrase-editor/batchdialog.ui:50 +#. i18n: file: qt6/quickphrase-editor/batchdialog.ui:50 #. i18n: ectx: property (text), widget (QLabel, infoLabel) #: rc.cpp:6 #, kde-format msgid "Use <Keyword> <Phrase> format on every line." msgstr "Utiliser<Keyword><Phrase> format sur chaque ligne." -#: qt5/guiwrapper/wrapperapp.cpp:37 qt6/guiwrapper/wrapperapp.cpp:37 +#: qt5/guiwrapper/wrapperapp.cpp:40 qt6/guiwrapper/wrapperapp.cpp:40 msgid "path" msgstr "chemin" -#: qt5/guiwrapper/wrapperapp.cpp:34 qt6/guiwrapper/wrapperapp.cpp:34 +#: qt5/guiwrapper/wrapperapp.cpp:37 qt6/guiwrapper/wrapperapp.cpp:37 msgid "winid" msgstr "winid" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-qt-5.1.10/po/ka.po new/fcitx5-qt-5.1.12/po/ka.po --- old/fcitx5-qt-5.1.10/po/ka.po 1970-01-01 01:00:00.000000000 +0100 +++ new/fcitx5-qt-5.1.12/po/ka.po 2025-12-22 07:18:10.000000000 +0100 @@ -0,0 +1,253 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the fcitx5-qt package. +# +# Translators: +# Xuetian Weng <[email protected]>, 2025 +# +msgid "" +msgstr "" +"Project-Id-Version: fcitx5-qt\n" +"Report-Msgid-Bugs-To: [email protected]\n" +"POT-Creation-Date: 2025-12-22 03:28+0000\n" +"PO-Revision-Date: 2017-12-20 02:52+0000\n" +"Last-Translator: Xuetian Weng <[email protected]>, 2025\n" +"Language-Team: Georgian (https://app.transifex.com/fcitx/teams/12005/ka/)\n" +"Language: ka\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n!=1);\n" + +#: qt6/quickphrase-editor/editor.cpp:262 +msgid "%1 is a system file, do you want to delete all phrases instead?" +msgstr "%1 სისტემური ფაილია. გნებავთ ყველა ფრაზა წაშალოთ?" + +#. i18n: file: qt6/quickphrase-editor/editor.ui:52 +#. i18n: ectx: property (text), widget (QPushButton, addButton) +#: rc.cpp:12 +#, kde-format +msgid "&Add" +msgstr "დ&ამატება" + +#: qt5/guiwrapper/mainwindow.cpp:32 qt6/guiwrapper/mainwindow.cpp:32 +msgid "&Apply" +msgstr "&გადატარება" + +#. i18n: file: qt6/quickphrase-editor/editor.ui:63 +#. i18n: ectx: property (text), widget (QPushButton, batchEditButton) +#: rc.cpp:15 +#, kde-format +msgid "&Batch Edit" +msgstr "&ერთდროული ჩასწორება" + +#: qt5/guiwrapper/mainwindow.cpp:34 qt6/guiwrapper/mainwindow.cpp:34 +msgid "&Close" +msgstr "&დახურვა" + +#. i18n: file: qt6/quickphrase-editor/editor.ui:74 +#. i18n: ectx: property (text), widget (QPushButton, deleteButton) +#: rc.cpp:18 +#, kde-format +msgid "&Delete" +msgstr "&წაშლა" + +#. i18n: file: qt6/quickphrase-editor/editor.ui:103 +#. i18n: ectx: property (text), widget (QPushButton, importButton) +#: rc.cpp:24 +#, kde-format +msgid "&Import" +msgstr "&შემოტანა" + +#: qt5/guiwrapper/mainwindow.cpp:31 qt6/guiwrapper/mainwindow.cpp:31 +msgid "&Ok" +msgstr "&დიახ" + +#. i18n: file: qt6/quickphrase-editor/editor.ui:45 +#. i18n: ectx: property (text), widget (QPushButton, operationButton) +#: rc.cpp:9 +#, kde-format +msgid "&Operation" +msgstr "&ოპერაცია" + +#: qt5/guiwrapper/mainwindow.cpp:33 qt6/guiwrapper/mainwindow.cpp:33 +msgid "&Reset" +msgstr "ჩამოყ&რა" + +#: qt5/guiwrapper/wrapperapp.cpp:34 qt6/guiwrapper/wrapperapp.cpp:34 +msgid "A launcher for Fcitx Gui plugin." +msgstr "გამშვები Fcitx Gui მოდულისთვის." + +#: qt6/quickphrase-editor/editor.cpp:35 +msgid "Add File" +msgstr "ფაილის დამატება" + +#: qt6/quickphrase-editor/editor.cpp:274 +msgid "Are you sure to delete %1?" +msgstr "დარწმუნებული ბრძანდებით, რომ გნებავთ წაშალოთ %1?" + +#. i18n: file: qt6/quickphrase-editor/batchdialog.ui:14 +#. i18n: ectx: property (windowTitle), widget (QDialog, BatchDialog) +#: rc.cpp:3 +#, kde-format +msgid "Batch editing" +msgstr "პაკეტური ჩასწორება" + +#: qt6/quickphrase-editor/editor.cpp:240 +msgid "Cannot create file %1." +msgstr "ფაილის %1 შექმნის შეცდომა." + +#: qt6/quickphrase-editor/editor.cpp:261 +msgid "Cannot remove system file" +msgstr "სისტემური ფაილის წაშლა შეუძლებელია" + +#: qt5/guiwrapper/wrapperapp.cpp:40 qt6/guiwrapper/wrapperapp.cpp:40 +msgid "Config path" +msgstr "კონფიგურაციის ბილიკი" + +#: qt6/quickphrase-editor/editor.cpp:273 +msgid "Confirm deletion" +msgstr "წაშლის დადასტურება" + +#: qt6/quickphrase-editor/editor.cpp:223 +msgid "Create new file" +msgstr "ახალი ფაილის შექმნა" + +#. i18n: file: qt6/quickphrase-editor/editor.ui:85 +#. i18n: ectx: property (text), widget (QPushButton, clearButton) +#: rc.cpp:21 +#, kde-format +msgid "De&lete All" +msgstr "&ყველას წაშლა" + +#: qt6/quickphrase-editor/filelistmodel.cpp:35 +msgid "Default" +msgstr "ნაგულისხმევი" + +#. i18n: file: qt6/quickphrase-editor/editor.ui:114 +#. i18n: ectx: property (text), widget (QPushButton, exportButton) +#: rc.cpp:27 +#, kde-format +msgid "E&xport" +msgstr "&გატანა" + +#: qt5/widgetsaddons/fcitxqtkeysequencewidget.cpp:353 +#: qt6/widgetsaddons/fcitxqtkeysequencewidget.cpp:322 +msgid "Empty" +msgstr "ცარიელი" + +#: qt6/quickphrase-editor/editor.cpp:282 +msgid "Error while deleting %1." +msgstr "შეცდომა %1-ის წაშლისას." + +#: qt5/guiwrapper/mainwindow.cpp:109 qt6/guiwrapper/mainwindow.cpp:109 +msgid "Failed to notify Fcitx" +msgstr "Fcitx-ის გაფრთხილება ჩავარდა" + +#: qt5/guiwrapper/mainwindow.cpp:110 qt6/guiwrapper/mainwindow.cpp:110 +msgid "Failed to notify Fcitx about the configuration change." +msgstr "Fcitx-ის გაფრთხილება კონფიგურაციის ცვლილების შესახებ ჩავარდა." + +#: qt5/guiwrapper/org.fcitx.fcitx5-qt5-gui-wrapper.desktop.in.in:2 +msgid "Fcitx 5 Qt5 Gui Wrapper" +msgstr "Fcitx 5 Qt5 Gui გადამტანი" + +#: qt6/guiwrapper/org.fcitx.fcitx5-qt6-gui-wrapper.desktop.in.in:2 +msgid "Fcitx 5 Qt6 Gui Wrapper" +msgstr "Fcitx 5 Qt6 Gui გადამტანი" + +#: qt6/quickphrase-editor/editor.cpp:239 qt6/quickphrase-editor/editor.cpp:281 +msgid "File Operation Failed" +msgstr "ფაილის ოპერაცია ვერ განხორციელდა" + +#: qt6/quickphrase-editor/editor.cpp:228 +msgid "File name should not contain '/'." +msgstr "ფაილის სახელი არ შეიძლება \"/\"-ს შეიცავდეს." + +#: qt5/guiwrapper/org.fcitx.fcitx5-qt5-gui-wrapper.desktop.in.in:3 +#: qt6/guiwrapper/org.fcitx.fcitx5-qt6-gui-wrapper.desktop.in.in:3 +msgid "Input Method Configuration helper" +msgstr "შეყვანის მეთოდის კონფიგურაციის დამხმარე" + +#: qt6/quickphrase-editor/editor.cpp:227 +msgid "Invalid filename" +msgstr "ფაილის არასწორი სახელი" + +#: qt5/widgetsaddons/fcitxqtkeysequencewidget.cpp:179 +#: qt6/widgetsaddons/fcitxqtkeysequencewidget.cpp:148 +msgid "Key code mode" +msgstr "ღილაკის კოდის რეჟიმი" + +#: qt6/quickphrase-editor/model.cpp:83 +msgid "Keyword" +msgstr "საკვანძო სიტყვა" + +#: qt5/guiwrapper/org.fcitx.fcitx5-qt5-gui-wrapper.desktop.in.in:4 +#: qt6/guiwrapper/org.fcitx.fcitx5-qt6-gui-wrapper.desktop.in.in:4 +msgid "Load configuration plugin for Fcitx Addon" +msgstr "კონფიგურაციის მოდულის ჩატვირთვა Fcitx-ის დამატებისთვის" + +#: qt5/guiwrapper/wrapperapp.cpp:37 qt6/guiwrapper/wrapperapp.cpp:37 +msgid "Parent window ID" +msgstr "მშობელი ფანჯრის ID" + +#: qt6/quickphrase-editor/model.cpp:86 +msgid "Phrase" +msgstr "ფრაზა" + +#: qt6/quickphrase-editor/editor.cpp:223 +msgid "Please input a filename for newfile" +msgstr "შეიყვანეთ ახალი ფაილის სახელი" + +#: qt6/quickphrase-editor/editor.cpp:103 +msgid "Quick Phrase Editor" +msgstr "სწრაფი ფრაზების რედაქტორი" + +#: qt6/quickphrase-editor/editor.cpp:39 +msgid "Refresh List" +msgstr "სიის განახლება" + +#: qt6/quickphrase-editor/editor.cpp:37 +msgid "Remove File" +msgstr "ფაილის წაშლა" + +#: qt6/quickphrase-editor/editor.cpp:87 +msgid "Save Changes" +msgstr "ცვლილებების შენახვა" + +#: qt5/guiwrapper/wrapperapp.cpp:38 qt6/guiwrapper/wrapperapp.cpp:38 +msgid "Test if config exists" +msgstr "შემოწმება, თუ კონფიგურაცია არსებობს" + +#: qt6/quickphrase-editor/editor.cpp:88 +msgid "" +"The content has changed.\n" +"Do you want to save the changes or discard them?" +msgstr "" +"შემცველობა შეიცვალა.\n" +"გნებავთ, შეინახოთ ცვლილებები თუ მოვაცილო ისინი?" + +#: qt5/widgetsaddons/fcitxqtkeysequencewidget.cpp:390 +#: qt6/widgetsaddons/fcitxqtkeysequencewidget.cpp:359 +msgid "The key you just pressed is not supported by Qt." +msgstr "ღილაკი, რომელსაც დააჭირეთ, Qt-ის მიერ მხარდაჭერილი არაა." + +#: qt5/widgetsaddons/fcitxqtkeysequencewidget.cpp:391 +#: qt6/widgetsaddons/fcitxqtkeysequencewidget.cpp:360 +msgid "Unsupported Key" +msgstr "მხარდაუჭერელი ღილაკი" + +#. i18n: file: qt6/quickphrase-editor/batchdialog.ui:50 +#. i18n: ectx: property (text), widget (QLabel, infoLabel) +#: rc.cpp:6 +#, kde-format +msgid "Use <Keyword> <Phrase> format on every line." +msgstr "ყოველ ხაზზე <საკვანძო სიტყვა> <ფრაზა> ფორმატის გამოყენება." + +#: qt5/guiwrapper/wrapperapp.cpp:40 qt6/guiwrapper/wrapperapp.cpp:40 +msgid "path" +msgstr "ბილიკი" + +#: qt5/guiwrapper/wrapperapp.cpp:37 qt6/guiwrapper/wrapperapp.cpp:37 +msgid "winid" +msgstr "winid" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-qt-5.1.10/po/vi.po new/fcitx5-qt-5.1.12/po/vi.po --- old/fcitx5-qt-5.1.10/po/vi.po 2025-06-16 09:21:11.000000000 +0200 +++ new/fcitx5-qt-5.1.12/po/vi.po 2025-12-22 07:18:10.000000000 +0100 @@ -3,15 +3,15 @@ # This file is distributed under the same license as the fcitx5-qt package. # # Translators: -# hoanghuy309 <[email protected]>, 2025 +# Huy Võ <[email protected]>, 2025 # msgid "" msgstr "" "Project-Id-Version: fcitx5-qt\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2025-04-22 20:24+0000\n" +"POT-Creation-Date: 2025-11-18 20:24+0000\n" "PO-Revision-Date: 2017-12-20 02:52+0000\n" -"Last-Translator: hoanghuy309 <[email protected]>, 2025\n" +"Last-Translator: Huy Võ <[email protected]>, 2025\n" "Language-Team: Vietnamese (https://app.transifex.com/fcitx/teams/12005/vi/)\n" "Language: vi\n" "MIME-Version: 1.0\n" @@ -19,15 +19,15 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: qt5/quickphrase-editor/editor.cpp:260 qt6/quickphrase-editor/editor.cpp:260 +#: qt6/quickphrase-editor/editor.cpp:262 msgid "%1 is a system file, do you want to delete all phrases instead?" msgstr "" +"%1 là một tập tin hệ thống, thay vào đó bạn có muốn xóa tất cả các cụm từ " +"không?" -#. i18n: file: qt5/quickphrase-editor/editor.ui:52 -#. i18n: ectx: property (text), widget (QPushButton, addButton) #. i18n: file: qt6/quickphrase-editor/editor.ui:52 #. i18n: ectx: property (text), widget (QPushButton, addButton) -#: rc.cpp:12 rc.cpp:39 +#: rc.cpp:12 #, kde-format msgid "&Add" msgstr "" @@ -36,11 +36,9 @@ msgid "&Apply" msgstr "" -#. i18n: file: qt5/quickphrase-editor/editor.ui:63 -#. i18n: ectx: property (text), widget (QPushButton, batchEditButton) #. i18n: file: qt6/quickphrase-editor/editor.ui:63 #. i18n: ectx: property (text), widget (QPushButton, batchEditButton) -#: rc.cpp:15 rc.cpp:42 +#: rc.cpp:15 #, kde-format msgid "&Batch Edit" msgstr "" @@ -49,20 +47,16 @@ msgid "&Close" msgstr "Đóng" -#. i18n: file: qt5/quickphrase-editor/editor.ui:74 -#. i18n: ectx: property (text), widget (QPushButton, deleteButton) #. i18n: file: qt6/quickphrase-editor/editor.ui:74 #. i18n: ectx: property (text), widget (QPushButton, deleteButton) -#: rc.cpp:18 rc.cpp:45 +#: rc.cpp:18 #, kde-format msgid "&Delete" -msgstr "" +msgstr "Xóa" -#. i18n: file: qt5/quickphrase-editor/editor.ui:103 -#. i18n: ectx: property (text), widget (QPushButton, importButton) #. i18n: file: qt6/quickphrase-editor/editor.ui:103 #. i18n: ectx: property (text), widget (QPushButton, importButton) -#: rc.cpp:24 rc.cpp:51 +#: rc.cpp:24 #, kde-format msgid "&Import" msgstr "" @@ -71,11 +65,9 @@ msgid "&Ok" msgstr "" -#. i18n: file: qt5/quickphrase-editor/editor.ui:45 -#. i18n: ectx: property (text), widget (QPushButton, operationButton) #. i18n: file: qt6/quickphrase-editor/editor.ui:45 #. i18n: ectx: property (text), widget (QPushButton, operationButton) -#: rc.cpp:9 rc.cpp:36 +#: rc.cpp:9 #, kde-format msgid "&Operation" msgstr "" @@ -84,66 +76,59 @@ msgid "&Reset" msgstr "" -#: qt5/guiwrapper/wrapperapp.cpp:32 qt6/guiwrapper/wrapperapp.cpp:32 +#: qt5/guiwrapper/wrapperapp.cpp:34 qt6/guiwrapper/wrapperapp.cpp:34 msgid "A launcher for Fcitx Gui plugin." msgstr "" -#: qt5/quickphrase-editor/editor.cpp:33 qt6/quickphrase-editor/editor.cpp:33 +#: qt6/quickphrase-editor/editor.cpp:35 msgid "Add File" msgstr "" -#: qt5/quickphrase-editor/editor.cpp:272 qt6/quickphrase-editor/editor.cpp:272 +#: qt6/quickphrase-editor/editor.cpp:274 msgid "Are you sure to delete %1?" -msgstr "" +msgstr "Bạn có chắc chắn xóa %1?" -#. i18n: file: qt5/quickphrase-editor/batchdialog.ui:14 -#. i18n: ectx: property (windowTitle), widget (QDialog, BatchDialog) #. i18n: file: qt6/quickphrase-editor/batchdialog.ui:14 #. i18n: ectx: property (windowTitle), widget (QDialog, BatchDialog) -#: rc.cpp:3 rc.cpp:30 +#: rc.cpp:3 #, kde-format msgid "Batch editing" msgstr "" -#: qt5/quickphrase-editor/editor.cpp:238 qt6/quickphrase-editor/editor.cpp:238 +#: qt6/quickphrase-editor/editor.cpp:240 msgid "Cannot create file %1." msgstr "" -#: qt5/quickphrase-editor/editor.cpp:259 qt6/quickphrase-editor/editor.cpp:259 +#: qt6/quickphrase-editor/editor.cpp:261 msgid "Cannot remove system file" msgstr "" -#: qt5/guiwrapper/wrapperapp.cpp:38 qt6/guiwrapper/wrapperapp.cpp:38 +#: qt5/guiwrapper/wrapperapp.cpp:40 qt6/guiwrapper/wrapperapp.cpp:40 msgid "Config path" msgstr "Đường dẫn cấu hình" -#: qt5/quickphrase-editor/editor.cpp:271 qt6/quickphrase-editor/editor.cpp:271 +#: qt6/quickphrase-editor/editor.cpp:273 msgid "Confirm deletion" msgstr "" -#: qt5/quickphrase-editor/editor.cpp:221 qt6/quickphrase-editor/editor.cpp:221 +#: qt6/quickphrase-editor/editor.cpp:223 msgid "Create new file" msgstr "" -#. i18n: file: qt5/quickphrase-editor/editor.ui:85 -#. i18n: ectx: property (text), widget (QPushButton, clearButton) #. i18n: file: qt6/quickphrase-editor/editor.ui:85 #. i18n: ectx: property (text), widget (QPushButton, clearButton) -#: rc.cpp:21 rc.cpp:48 +#: rc.cpp:21 #, kde-format msgid "De&lete All" msgstr "Xóa Tất Cả" -#: qt5/quickphrase-editor/filelistmodel.cpp:29 -#: qt6/quickphrase-editor/filelistmodel.cpp:29 +#: qt6/quickphrase-editor/filelistmodel.cpp:35 msgid "Default" msgstr "Mặc định" -#. i18n: file: qt5/quickphrase-editor/editor.ui:114 -#. i18n: ectx: property (text), widget (QPushButton, exportButton) #. i18n: file: qt6/quickphrase-editor/editor.ui:114 #. i18n: ectx: property (text), widget (QPushButton, exportButton) -#: rc.cpp:27 rc.cpp:54 +#: rc.cpp:27 #, kde-format msgid "E&xport" msgstr "" @@ -153,7 +138,7 @@ msgid "Empty" msgstr "" -#: qt5/quickphrase-editor/editor.cpp:280 qt6/quickphrase-editor/editor.cpp:280 +#: qt6/quickphrase-editor/editor.cpp:282 msgid "Error while deleting %1." msgstr "" @@ -163,7 +148,7 @@ #: qt5/guiwrapper/mainwindow.cpp:110 qt6/guiwrapper/mainwindow.cpp:110 msgid "Failed to notify Fcitx about the configuration change." -msgstr "" +msgstr "Thông báo thất bại cho Fcitx về việc thay đổi cấu hình." #: qt5/guiwrapper/org.fcitx.fcitx5-qt5-gui-wrapper.desktop.in.in:2 msgid "Fcitx 5 Qt5 Gui Wrapper" @@ -173,12 +158,11 @@ msgid "Fcitx 5 Qt6 Gui Wrapper" msgstr "" -#: qt5/quickphrase-editor/editor.cpp:237 qt5/quickphrase-editor/editor.cpp:279 -#: qt6/quickphrase-editor/editor.cpp:237 qt6/quickphrase-editor/editor.cpp:279 +#: qt6/quickphrase-editor/editor.cpp:239 qt6/quickphrase-editor/editor.cpp:281 msgid "File Operation Failed" msgstr "" -#: qt5/quickphrase-editor/editor.cpp:226 qt6/quickphrase-editor/editor.cpp:226 +#: qt6/quickphrase-editor/editor.cpp:228 msgid "File name should not contain '/'." msgstr "" @@ -187,7 +171,7 @@ msgid "Input Method Configuration helper" msgstr "Trợ Giúp Cấu Hình Kiểu Gõ" -#: qt5/quickphrase-editor/editor.cpp:225 qt6/quickphrase-editor/editor.cpp:225 +#: qt6/quickphrase-editor/editor.cpp:227 msgid "Invalid filename" msgstr "" @@ -196,48 +180,48 @@ msgid "Key code mode" msgstr "Chế độ mã phím" -#: qt5/quickphrase-editor/model.cpp:73 qt6/quickphrase-editor/model.cpp:73 +#: qt6/quickphrase-editor/model.cpp:83 msgid "Keyword" msgstr "Từ khóa" #: qt5/guiwrapper/org.fcitx.fcitx5-qt5-gui-wrapper.desktop.in.in:4 #: qt6/guiwrapper/org.fcitx.fcitx5-qt6-gui-wrapper.desktop.in.in:4 msgid "Load configuration plugin for Fcitx Addon" -msgstr "" +msgstr "Tải plugin cấu hình cho Fcitx Addon" -#: qt5/guiwrapper/wrapperapp.cpp:35 qt6/guiwrapper/wrapperapp.cpp:35 +#: qt5/guiwrapper/wrapperapp.cpp:37 qt6/guiwrapper/wrapperapp.cpp:37 msgid "Parent window ID" msgstr "" -#: qt5/quickphrase-editor/model.cpp:75 qt6/quickphrase-editor/model.cpp:75 +#: qt6/quickphrase-editor/model.cpp:86 msgid "Phrase" msgstr "" -#: qt5/quickphrase-editor/editor.cpp:221 qt6/quickphrase-editor/editor.cpp:221 +#: qt6/quickphrase-editor/editor.cpp:223 msgid "Please input a filename for newfile" msgstr "" -#: qt5/quickphrase-editor/editor.cpp:101 qt6/quickphrase-editor/editor.cpp:101 +#: qt6/quickphrase-editor/editor.cpp:103 msgid "Quick Phrase Editor" msgstr "" -#: qt5/quickphrase-editor/editor.cpp:37 qt6/quickphrase-editor/editor.cpp:37 +#: qt6/quickphrase-editor/editor.cpp:39 msgid "Refresh List" msgstr "" -#: qt5/quickphrase-editor/editor.cpp:35 qt6/quickphrase-editor/editor.cpp:35 +#: qt6/quickphrase-editor/editor.cpp:37 msgid "Remove File" msgstr "" -#: qt5/quickphrase-editor/editor.cpp:85 qt6/quickphrase-editor/editor.cpp:85 +#: qt6/quickphrase-editor/editor.cpp:87 msgid "Save Changes" msgstr "Lưu Thay Đổi" -#: qt5/guiwrapper/wrapperapp.cpp:36 qt6/guiwrapper/wrapperapp.cpp:36 +#: qt5/guiwrapper/wrapperapp.cpp:38 qt6/guiwrapper/wrapperapp.cpp:38 msgid "Test if config exists" msgstr "Kiểm tra nếu cấu hình tồn tại" -#: qt5/quickphrase-editor/editor.cpp:86 qt6/quickphrase-editor/editor.cpp:86 +#: qt6/quickphrase-editor/editor.cpp:88 msgid "" "The content has changed.\n" "Do you want to save the changes or discard them?" @@ -255,19 +239,17 @@ msgid "Unsupported Key" msgstr "Phím Không Được Hỗ Trợ" -#. i18n: file: qt5/quickphrase-editor/batchdialog.ui:50 -#. i18n: ectx: property (text), widget (QLabel, infoLabel) #. i18n: file: qt6/quickphrase-editor/batchdialog.ui:50 #. i18n: ectx: property (text), widget (QLabel, infoLabel) -#: rc.cpp:6 rc.cpp:33 +#: rc.cpp:6 #, kde-format msgid "Use <Keyword> <Phrase> format on every line." msgstr "" -#: qt5/guiwrapper/wrapperapp.cpp:38 qt6/guiwrapper/wrapperapp.cpp:38 +#: qt5/guiwrapper/wrapperapp.cpp:40 qt6/guiwrapper/wrapperapp.cpp:40 msgid "path" msgstr "" -#: qt5/guiwrapper/wrapperapp.cpp:35 qt6/guiwrapper/wrapperapp.cpp:35 +#: qt5/guiwrapper/wrapperapp.cpp:37 qt6/guiwrapper/wrapperapp.cpp:37 msgid "winid" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-qt-5.1.10/qt5/platforminputcontext/qfcitxplatforminputcontext.cpp new/fcitx5-qt-5.1.12/qt5/platforminputcontext/qfcitxplatforminputcontext.cpp --- old/fcitx5-qt-5.1.10/qt5/platforminputcontext/qfcitxplatforminputcontext.cpp 2025-06-16 09:21:11.000000000 +0200 +++ new/fcitx5-qt-5.1.12/qt5/platforminputcontext/qfcitxplatforminputcontext.cpp 2025-12-22 07:18:10.000000000 +0100 @@ -389,6 +389,11 @@ return; } + // Limit the queries to the only ones we care about. + queries &= + (Qt::ImEnabled | Qt::ImHints | Qt::ImSurroundingText | + Qt::ImCursorPosition | Qt::ImAnchorPosition | Qt::ImCursorRectangle); + QInputMethodQueryEvent query(queries); QGuiApplication::sendEvent(input, &query); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-qt-5.1.10/qt5/widgetsaddons/fcitxqtconfiguifactory.cpp new/fcitx5-qt-5.1.12/qt5/widgetsaddons/fcitxqtconfiguifactory.cpp --- old/fcitx5-qt-5.1.10/qt5/widgetsaddons/fcitxqtconfiguifactory.cpp 2025-06-16 09:21:11.000000000 +0200 +++ new/fcitx5-qt-5.1.12/qt5/widgetsaddons/fcitxqtconfiguifactory.cpp 2025-12-22 07:18:10.000000000 +0100 @@ -72,7 +72,7 @@ void FcitxQtConfigUIFactoryPrivate::scan() { auto addonFiles = fcitx::StandardPaths::global().locate( - fcitx::StandardPathsType::Addon, "qt6", + fcitx::StandardPathsType::Addon, "qt5", [](const std::filesystem::path &path) { return QLibrary::isLibrary(QString::fromStdString(path)); }, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-qt-5.1.10/qt6/CMakeLists.txt new/fcitx5-qt-5.1.12/qt6/CMakeLists.txt --- old/fcitx5-qt-5.1.10/qt6/CMakeLists.txt 2025-06-16 09:21:11.000000000 +0200 +++ new/fcitx5-qt-5.1.12/qt6/CMakeLists.txt 2025-12-22 07:18:10.000000000 +0100 @@ -1,11 +1,20 @@ -find_package(Qt6 ${REQUIRED_QT6_VERSION} CONFIG REQUIRED Core DBus Widgets) -find_package(Qt6Gui ${REQUIRED_QT6_VERSION} REQUIRED Private) +set(QT6_REQUIRED_COMPONENTS Core Gui DBus Widgets) + if (ENABLE_QT6_WAYLAND_WORKAROUND) - find_package(Qt6WaylandClient ${REQUIRED_QT6_VERSION} REQUIRED Private) - find_package(Qt6WaylandGlobalPrivate ${REQUIRED_QT6_VERSION} REQUIRED) + list(APPEND QT6_REQUIRED_COMPONENTS WaylandClient WaylandGlobalPrivate) +endif() +find_package(Qt6 ${REQUIRED_QT6_VERSION} CONFIG REQUIRED COMPONENTS ${QT6_REQUIRED_COMPONENTS}) + +if (NOT TARGET Qt6::GuiPrivate) + find_package(Qt6GuiPrivate CONFIG REQUIRED) endif() +if (ENABLE_QT6_WAYLAND_WORKAROUND AND NOT TARGET Qt6::WaylandClientPrivate) + find_package(Qt6WaylandClientPrivate CONFIG REQUIRED) +endif() + + add_subdirectory(dbusaddons) add_subdirectory(platforminputcontext) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-qt-5.1.10/qt6/immodule-probing/CMakeLists.txt new/fcitx5-qt-5.1.12/qt6/immodule-probing/CMakeLists.txt --- old/fcitx5-qt-5.1.10/qt6/immodule-probing/CMakeLists.txt 2025-06-16 09:21:11.000000000 +0200 +++ new/fcitx5-qt-5.1.12/qt6/immodule-probing/CMakeLists.txt 2025-12-22 07:18:10.000000000 +0100 @@ -1,5 +1,4 @@ add_executable(fcitx5-qt6-immodule-probing main.cpp) -target_include_directories(fcitx5-qt6-immodule-probing PRIVATE ${Qt6Gui_PRIVATE_INCLUDE_DIRS}) -target_link_libraries(fcitx5-qt6-immodule-probing Qt6::Gui) +target_link_libraries(fcitx5-qt6-immodule-probing Qt6::Gui Qt6::GuiPrivate) -install(TARGETS fcitx5-qt6-immodule-probing DESTINATION "${CMAKE_INSTALL_BINDIR}") \ No newline at end of file +install(TARGETS fcitx5-qt6-immodule-probing DESTINATION "${CMAKE_INSTALL_BINDIR}")
