Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.16)
project(fcitx5-qt VERSION 5.1.8)
project(fcitx5-qt VERSION 5.1.9)
set(FCITX5_QT_VERSION ${PROJECT_VERSION})

set(REQUIRED_QT4_VERSION 4.8.0)
Expand Down
49 changes: 37 additions & 12 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,32 +1,57 @@
fcitx5-qt (5.1.8-2deepin3) unstable; urgency=medium
fcitx5-qt (5.1.9-1deepin1) unstable; urgency=medium

* Handle QLineEdit focus object correctly with QCompleter in Qt6.
* Add patches from master branch:
- 0001-Fix-can-t-switch-input-methods-through-the-systray-m.patch
- 0002-Handle-QLineEdit-focus-object-correctly-with-QCompleter.patch

-- Wang Yu <wangyu@uniontch.com> Wed, 18 Jun 2025 10:27:53 +0800
-- Wang Yu <wangyu@uniontech.com> Wed, 12 Mar 2025 10:50:00 +0800

fcitx5-qt (5.1.8-2deepin2) unstable; urgency=medium
fcitx5-qt (5.1.9-1) unstable; urgency=medium

* update version for rebuild.
* New upstream release.

-- liujianqiang <liujianqiang@uniontech.com> Mon, 26 May 2025 17:18:19 +0800
-- Boyuan Yang <byang@debian.org> Tue, 28 Jan 2025 09:23:41 -0500

fcitx5-qt (5.1.8-2deepin1) unstable; urgency=medium
fcitx5-qt (5.1.8-2) unstable; urgency=medium

* New upstream release.
[ Pino Toscano ]
* Limit Wayland support to Linux archs, as Wayland is available only there.

-- Boyuan Yang <byang@debian.org> Fri, 25 Oct 2024 18:24:33 -0400

fcitx5-qt (5.1.8-1) unstable; urgency=medium

* New upstream release.
* Fix compatibility with Qt 6.8.

-- Boyuan Yang <byang@debian.org> Sun, 20 Oct 2024 12:06:14 -0400

fcitx5-qt (5.1.7-1) unstable; urgency=medium

* New upstream release.

-- Boyuan Yang <byang@debian.org> Tue, 08 Oct 2024 18:55:17 -0400

fcitx5-qt (5.1.6-1) unstable; urgency=medium

* New upstream release.
* debian/control: Add missing development package dependency to
Qt5 and Qt6 dev packages.
* debian/libfcitx5-qt6-1.lintian-overrides: Update lintian overrides.

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

fcitx5-qt (5.1.3-1deepin1) unstable; urgency=medium
fcitx5-qt (5.1.5-1) unstable; urgency=medium

* fix: can't switch input methods through the systray menu
* New upstream release.

-- Boyuan Yang <byang@debian.org> Mon, 18 Mar 2024 23:08:56 -0400

fcitx5-qt (5.1.4-1) unstable; urgency=medium

* New upstream release.

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

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

Expand Down
2 changes: 1 addition & 1 deletion qt5/platforminputcontext/fcitx4inputcontextproxy_p.h
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ class Fcitx4InputContextProxyPrivate {
unsigned int>
reply(*createInputContextWatcher_);

QString path = QString("/inputcontext_%1").arg(reply.value());
QString path = QStringLiteral("/inputcontext_%1").arg(reply.value());
icproxy_ = new Fcitx4InputContextProxyImpl(improxy_->service(), path,
improxy_->connection(), q);
QObject::connect(icproxy_, &Fcitx4InputContextProxyImpl::CommitString,
Expand Down
8 changes: 4 additions & 4 deletions qt5/platforminputcontext/fcitx4watcher.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -48,29 +48,29 @@ int displayNumber() {

QString socketFile() {
QString filename =
QString("%1-%2")
QStringLiteral("%1-%2")
.arg(QString::fromLatin1(QDBusConnection::localMachineId()))
.arg(displayNumber());

QString home = QString::fromLocal8Bit(qgetenv("XDG_CONFIG_HOME"));
if (home.isEmpty()) {
home = QDir::homePath().append(QLatin1String("/.config"));
}
return QString("%1/fcitx/dbus/%2").arg(home).arg(filename);
return QStringLiteral("%1/fcitx/dbus/%2").arg(home).arg(filename);
}

namespace fcitx {

QString newUniqueConnectionName() {
static int idx = 0;
const auto newIdx = idx++;
return QString("_fcitx4_%1").arg(newIdx);
return QStringLiteral("_fcitx4_%1").arg(newIdx);
}

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

Fcitx4Watcher::~Fcitx4Watcher() {
Expand Down
10 changes: 5 additions & 5 deletions qt5/platforminputcontext/fcitxcandidatewindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -452,11 +452,11 @@ void FcitxCandidateWindow::updateClientSideUI(
doLayout(lowerLayout_);
labelLayouts_.clear();
candidateLayouts_.clear();
for (int i = 0; i < candidates.size(); i++) {
labelLayouts_.emplace_back(std::make_unique<MultilineText>(
theme_->font(), candidates[i].key()));
candidateLayouts_.emplace_back(std::make_unique<MultilineText>(
theme_->font(), candidates[i].value()));
for (const auto &candidate : candidates) {
labelLayouts_.emplace_back(
std::make_unique<MultilineText>(theme_->font(), candidate.key()));
candidateLayouts_.emplace_back(
std::make_unique<MultilineText>(theme_->font(), candidate.value()));
}
highlight_ = candidateIndex;
hasPrev_ = hasPrev;
Expand Down
11 changes: 6 additions & 5 deletions qt5/platforminputcontext/fcitxtheme.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ QColor readColor(const QSettings &settings, const QString &name,
} else if (colorString.size() == 9) {
// Qt accept "#AARRGGBB"
auto newColorString =
QString("#%1%2")
QStringLiteral("#%1%2")
.arg(colorString.mid(7, 2), colorString.mid(1, 6))
.toUpper();
color = QColor(newColorString);
Expand All @@ -55,13 +55,13 @@ void BackgroundImage::load(const QString &name, QSettings &settings) {
if (auto image = settings.value("Image").toString(); !image.isEmpty()) {
auto file = QStandardPaths::locate(
QStandardPaths::GenericDataLocation,
QString("fcitx5/themes/%1/%2").arg(name, image));
QStringLiteral("fcitx5/themes/%1/%2").arg(name, image));
image_.load(file);
}
if (auto image = settings.value("Overlay").toString(); !image.isEmpty()) {
auto file = QStandardPaths::locate(
QStandardPaths::GenericDataLocation,
QString("fcitx5/themes/%1/%2").arg(name, image));
QStringLiteral("fcitx5/themes/%1/%2").arg(name, image));
overlay_.load(file);
}

Expand Down Expand Up @@ -130,7 +130,7 @@ void ActionImage::load(const QString &name, QSettings &settings) {
if (auto image = settings.value("Image").toString(); !image.isEmpty()) {
auto file = QStandardPaths::locate(
QStandardPaths::GenericDataLocation,
QString("fcitx5/themes/%1/%2").arg(name, image));
QStringLiteral("fcitx5/themes/%1/%2").arg(name, image));
image_.load(file);
valid_ = !image_.isNull();
}
Expand Down Expand Up @@ -185,7 +185,8 @@ void FcitxTheme::themeChanged() {
if (!themeConfigPath_.isEmpty()) {
watcher_->removePath(themeConfigPath_);
}
auto themeConfig = QString("/fcitx5/themes/%1/theme.conf").arg(theme_);
auto themeConfig =
QStringLiteral("/fcitx5/themes/%1/theme.conf").arg(theme_);
themeConfigPath_ =
QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation)
.append(themeConfig);
Expand Down
10 changes: 5 additions & 5 deletions qt6/quickphrase-editor/model.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -225,8 +225,8 @@ QFutureWatcher<bool> *QuickPhraseModel::save(const QString &file) {
}

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

Expand Down Expand Up @@ -263,10 +263,10 @@ bool QuickPhraseModel::saveData(const QString &file,
if (!tempFile.open(fd, QIODevice::WriteOnly)) {
return false;
}
for (int i = 0; i < list.size(); i++) {
tempFile.write(list[i].first.toUtf8());
for (const auto &item : list) {
tempFile.write(item.first.toUtf8());
tempFile.write("\t");
tempFile.write(escapeValue(list[i].second).toUtf8());
tempFile.write(escapeValue(item.second).toUtf8());
tempFile.write("\n");
}
tempFile.close();
Expand Down
Loading