Compare commits

..

5 Commits

4 changed files with 31 additions and 41 deletions

30
debian/changelog vendored
View File

@ -1,3 +1,33 @@
libqtxdg (4.1.0-0ubuntu6) plucky; urgency=medium
* Update Standards-Version to 4.7.1, no changes needed.
-- Simon Quigley <tsimonq2@ubuntu.com> Fri, 21 Feb 2025 16:01:56 -0600
libqtxdg (4.1.0-0ubuntu5) plucky; urgency=medium
* No-change rebuild for Qt 6.8.2.
-- Simon Quigley <tsimonq2@ubuntu.com> Tue, 04 Feb 2025 11:05:34 -0600
libqtxdg (4.1.0-0ubuntu4) plucky; urgency=medium
* No-change rebuild for lxqt-build-tools C++17 -> C++20.
-- Simon Quigley <tsimonq2@ubuntu.com> Fri, 03 Jan 2025 03:53:46 -0600
libqtxdg (4.1.0-0ubuntu3) plucky; urgency=medium
* No-change rebuild for Qt 6.8.1.
-- Simon Quigley <tsimonq2@ubuntu.com> Wed, 04 Dec 2024 14:32:44 -0600
libqtxdg (4.1.0-0ubuntu2) plucky; urgency=medium
* No-change rebuild for Qt 6.8.0.
-- Simon Quigley <tsimonq2@ubuntu.com> Wed, 04 Dec 2024 14:32:44 -0600
libqtxdg (4.1.0-0ubuntu1) plucky; urgency=medium
* New upstream release.

2
debian/control vendored
View File

@ -16,7 +16,7 @@ Build-Depends: cmake,
qt6-svg-dev,
qt6-tools-dev,
qt6-tools-dev-tools
Standards-Version: 4.7.0
Standards-Version: 4.7.1
Rules-Requires-Root: no
Vcs-Browser: https://git.lubuntu.me/Lubuntu/libqtxdg-packaging
Vcs-Git: https://git.lubuntu.me/Lubuntu/libqtxdg-packaging.git

View File

@ -1,2 +1 @@
ubuntu-gettext-translations.patch
test-qt69-build.patch

View File

@ -1,39 +0,0 @@
Description: https://github.com/lxqt/libqtxdg/issues/310
diff --git a/src/xdgiconloader/xdgiconloader.cpp b/src/xdgiconloader/xdgiconloader.cpp
index c299cca..2353ba4 100644
--- a/src/xdgiconloader/xdgiconloader.cpp
+++ b/src/xdgiconloader/xdgiconloader.cpp
@@ -439,7 +439,11 @@ QThemeIconInfo XdgIconLoader::findIconHelper(const QString &themeName,
} else if (gSupportsSvg) {
const QString svgPath = subDir + svgIconName;
if (QFile::exists(svgPath)) {
- std::unique_ptr<ScalableEntry> iconEntry = (followColorScheme() && theme.followsColorScheme()) ? std::make_unique<ScalableFollowsColorEntry>() : std::make_unique<ScalableEntry>();
+ std::unique_ptr<QIconLoaderEngineEntry> iconEntry;
+ if (followColorScheme() && theme.followsColorScheme())
+ iconEntry = std::make_unique<ScalableFollowsColorEntry>();
+ else
+ iconEntry = std::make_unique<ScalableEntry>();
iconEntry->dir = dirInfo;
iconEntry->filename = svgPath;
info.entries.push_back(std::move(iconEntry));
diff --git a/src/xdgiconloader/xdgiconloader_p.h b/src/xdgiconloader/xdgiconloader_p.h
index 6c5f17f..cb990a9 100644
--- a/src/xdgiconloader/xdgiconloader_p.h
+++ b/src/xdgiconloader/xdgiconloader_p.h
@@ -61,13 +61,14 @@
class XdgIconLoader;
-struct ScalableFollowsColorEntry : public ScalableEntry
+struct ScalableFollowsColorEntry : public QIconLoaderEngineEntry
{
#if (QT_VERSION >= QT_VERSION_CHECK(6,8,0))
QPixmap pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state, qreal scale) override;
#else
QPixmap pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state) override;
#endif
+ QIcon svgIcon;
};
//class QIconLoaderEngine : public QIconEngine