Skip to content

Commit ffb45bf

Browse files
feat: update fcitx5-qt to 5.1.9-1
1 parent f11e508 commit ffb45bf

File tree

10 files changed

+52
-83
lines changed

10 files changed

+52
-83
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cmake_minimum_required(VERSION 3.16)
2-
project(fcitx5-qt VERSION 5.1.8)
2+
project(fcitx5-qt VERSION 5.1.9)
33
set(FCITX5_QT_VERSION ${PROJECT_VERSION})
44

55
set(REQUIRED_QT4_VERSION 4.8.0)

debian/changelog

Lines changed: 30 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,49 @@
1-
fcitx5-qt (5.1.8-2deepin3) unstable; urgency=medium
1+
fcitx5-qt (5.1.9-1) unstable; urgency=medium
22

3-
* Handle QLineEdit focus object correctly with QCompleter in Qt6.
3+
* New upstream release.
44

5-
-- Wang Yu <wangyu@uniontch.com> Wed, 18 Jun 2025 10:27:53 +0800
5+
-- Boyuan Yang <byang@debian.org> Tue, 28 Jan 2025 09:23:41 -0500
66

7-
fcitx5-qt (5.1.8-2deepin2) unstable; urgency=medium
7+
fcitx5-qt (5.1.8-2) unstable; urgency=medium
88

9-
* update version for rebuild.
9+
[ Pino Toscano ]
10+
* Limit Wayland support to Linux archs, as Wayland is available only there.
1011

11-
-- liujianqiang <liujianqiang@uniontech.com> Mon, 26 May 2025 17:18:19 +0800
12+
-- Boyuan Yang <byang@debian.org> Fri, 25 Oct 2024 18:24:33 -0400
1213

13-
fcitx5-qt (5.1.8-2deepin1) unstable; urgency=medium
14+
fcitx5-qt (5.1.8-1) unstable; urgency=medium
1415

1516
* New upstream release.
16-
[ Pino Toscano ]
17-
* Limit Wayland support to Linux archs, as Wayland is available only there.
1817
* Fix compatibility with Qt 6.8.
18+
19+
-- Boyuan Yang <byang@debian.org> Sun, 20 Oct 2024 12:06:14 -0400
20+
21+
fcitx5-qt (5.1.7-1) unstable; urgency=medium
22+
23+
* New upstream release.
24+
25+
-- Boyuan Yang <byang@debian.org> Tue, 08 Oct 2024 18:55:17 -0400
26+
27+
fcitx5-qt (5.1.6-1) unstable; urgency=medium
28+
29+
* New upstream release.
1930
* debian/control: Add missing development package dependency to
2031
Qt5 and Qt6 dev packages.
2132
* debian/libfcitx5-qt6-1.lintian-overrides: Update lintian overrides.
2233

23-
-- zsien <quezhiyong@deepin.org> Mon, 11 Nov 2024 14:17:17 +0800
34+
-- Boyuan Yang <byang@debian.org> Thu, 25 Apr 2024 22:12:49 -0400
2435

25-
fcitx5-qt (5.1.3-1deepin1) unstable; urgency=medium
36+
fcitx5-qt (5.1.5-1) unstable; urgency=medium
2637

27-
* fix: can't switch input methods through the systray menu
38+
* New upstream release.
39+
40+
-- Boyuan Yang <byang@debian.org> Mon, 18 Mar 2024 23:08:56 -0400
41+
42+
fcitx5-qt (5.1.4-1) unstable; urgency=medium
43+
44+
* New upstream release.
2845

29-
-- zsien <quezhiyong@deepin.org> Fri, 15 Mar 2024 09:55:08 +0800
46+
-- Boyuan Yang <byang@debian.org> Sat, 06 Jan 2024 14:07:50 -0500
3047

3148
fcitx5-qt (5.1.3-1) unstable; urgency=medium
3249

debian/patches/0001-Fix-can-t-switch-input-methods-through-the-systray-m.patch

Lines changed: 0 additions & 33 deletions
This file was deleted.

debian/patches/0002-Handle-QLineEdit-focus-object-correctly-with-QCompleter.patch

Lines changed: 0 additions & 14 deletions
This file was deleted.

debian/patches/series

Lines changed: 0 additions & 2 deletions
This file was deleted.

qt5/platforminputcontext/fcitx4inputcontextproxy_p.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ class Fcitx4InputContextProxyPrivate {
116116
unsigned int>
117117
reply(*createInputContextWatcher_);
118118

119-
QString path = QString("/inputcontext_%1").arg(reply.value());
119+
QString path = QStringLiteral("/inputcontext_%1").arg(reply.value());
120120
icproxy_ = new Fcitx4InputContextProxyImpl(improxy_->service(), path,
121121
improxy_->connection(), q);
122122
QObject::connect(icproxy_, &Fcitx4InputContextProxyImpl::CommitString,

qt5/platforminputcontext/fcitx4watcher.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,29 +48,29 @@ int displayNumber() {
4848

4949
QString socketFile() {
5050
QString filename =
51-
QString("%1-%2")
51+
QStringLiteral("%1-%2")
5252
.arg(QString::fromLatin1(QDBusConnection::localMachineId()))
5353
.arg(displayNumber());
5454

5555
QString home = QString::fromLocal8Bit(qgetenv("XDG_CONFIG_HOME"));
5656
if (home.isEmpty()) {
5757
home = QDir::homePath().append(QLatin1String("/.config"));
5858
}
59-
return QString("%1/fcitx/dbus/%2").arg(home).arg(filename);
59+
return QStringLiteral("%1/fcitx/dbus/%2").arg(home).arg(filename);
6060
}
6161

6262
namespace fcitx {
6363

6464
QString newUniqueConnectionName() {
6565
static int idx = 0;
6666
const auto newIdx = idx++;
67-
return QString("_fcitx4_%1").arg(newIdx);
67+
return QStringLiteral("_fcitx4_%1").arg(newIdx);
6868
}
6969

7070
Fcitx4Watcher::Fcitx4Watcher(QDBusConnection sessionBus, QObject *parent)
7171
: QObject(parent), connection_(nullptr), sessionBus_(sessionBus),
7272
socketFile_(socketFile()),
73-
serviceName_(QString("org.fcitx.Fcitx-%1").arg(displayNumber())),
73+
serviceName_(QStringLiteral("org.fcitx.Fcitx-%1").arg(displayNumber())),
7474
availability_(false), uniqueConnectionName_(newUniqueConnectionName()) {}
7575

7676
Fcitx4Watcher::~Fcitx4Watcher() {

qt5/platforminputcontext/fcitxcandidatewindow.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -452,11 +452,11 @@ void FcitxCandidateWindow::updateClientSideUI(
452452
doLayout(lowerLayout_);
453453
labelLayouts_.clear();
454454
candidateLayouts_.clear();
455-
for (int i = 0; i < candidates.size(); i++) {
456-
labelLayouts_.emplace_back(std::make_unique<MultilineText>(
457-
theme_->font(), candidates[i].key()));
458-
candidateLayouts_.emplace_back(std::make_unique<MultilineText>(
459-
theme_->font(), candidates[i].value()));
455+
for (const auto &candidate : candidates) {
456+
labelLayouts_.emplace_back(
457+
std::make_unique<MultilineText>(theme_->font(), candidate.key()));
458+
candidateLayouts_.emplace_back(
459+
std::make_unique<MultilineText>(theme_->font(), candidate.value()));
460460
}
461461
highlight_ = candidateIndex;
462462
hasPrev_ = hasPrev;

qt5/platforminputcontext/fcitxtheme.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ QColor readColor(const QSettings &settings, const QString &name,
3939
} else if (colorString.size() == 9) {
4040
// Qt accept "#AARRGGBB"
4141
auto newColorString =
42-
QString("#%1%2")
42+
QStringLiteral("#%1%2")
4343
.arg(colorString.mid(7, 2), colorString.mid(1, 6))
4444
.toUpper();
4545
color = QColor(newColorString);
@@ -55,13 +55,13 @@ void BackgroundImage::load(const QString &name, QSettings &settings) {
5555
if (auto image = settings.value("Image").toString(); !image.isEmpty()) {
5656
auto file = QStandardPaths::locate(
5757
QStandardPaths::GenericDataLocation,
58-
QString("fcitx5/themes/%1/%2").arg(name, image));
58+
QStringLiteral("fcitx5/themes/%1/%2").arg(name, image));
5959
image_.load(file);
6060
}
6161
if (auto image = settings.value("Overlay").toString(); !image.isEmpty()) {
6262
auto file = QStandardPaths::locate(
6363
QStandardPaths::GenericDataLocation,
64-
QString("fcitx5/themes/%1/%2").arg(name, image));
64+
QStringLiteral("fcitx5/themes/%1/%2").arg(name, image));
6565
overlay_.load(file);
6666
}
6767

@@ -130,7 +130,7 @@ void ActionImage::load(const QString &name, QSettings &settings) {
130130
if (auto image = settings.value("Image").toString(); !image.isEmpty()) {
131131
auto file = QStandardPaths::locate(
132132
QStandardPaths::GenericDataLocation,
133-
QString("fcitx5/themes/%1/%2").arg(name, image));
133+
QStringLiteral("fcitx5/themes/%1/%2").arg(name, image));
134134
image_.load(file);
135135
valid_ = !image_.isNull();
136136
}
@@ -185,7 +185,8 @@ void FcitxTheme::themeChanged() {
185185
if (!themeConfigPath_.isEmpty()) {
186186
watcher_->removePath(themeConfigPath_);
187187
}
188-
auto themeConfig = QString("/fcitx5/themes/%1/theme.conf").arg(theme_);
188+
auto themeConfig =
189+
QStringLiteral("/fcitx5/themes/%1/theme.conf").arg(theme_);
189190
themeConfigPath_ =
190191
QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation)
191192
.append(themeConfig);

qt6/quickphrase-editor/model.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -225,8 +225,8 @@ QFutureWatcher<bool> *QuickPhraseModel::save(const QString &file) {
225225
}
226226

227227
void QuickPhraseModel::saveDataToStream(QTextStream &dev) {
228-
for (int i = 0; i < list_.size(); i++) {
229-
dev << list_[i].first << "\t" << escapeValue(list_[i].second) << "\n";
228+
for (const auto &item : list_) {
229+
dev << item.first << "\t" << escapeValue(item.second) << "\n";
230230
}
231231
}
232232

@@ -263,10 +263,10 @@ bool QuickPhraseModel::saveData(const QString &file,
263263
if (!tempFile.open(fd, QIODevice::WriteOnly)) {
264264
return false;
265265
}
266-
for (int i = 0; i < list.size(); i++) {
267-
tempFile.write(list[i].first.toUtf8());
266+
for (const auto &item : list) {
267+
tempFile.write(item.first.toUtf8());
268268
tempFile.write("\t");
269-
tempFile.write(escapeValue(list[i].second).toUtf8());
269+
tempFile.write(escapeValue(item.second).toUtf8());
270270
tempFile.write("\n");
271271
}
272272
tempFile.close();

0 commit comments

Comments
 (0)