mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2025-01-27 23:44:04 +00:00
extra/libqtxdg to 4.0.1-1
This commit is contained in:
Kevin Mihelich
parent
3eb369a4e3
commit
16dfaf9385
3 changed files with 8 additions and 339 deletions
|
|
@ -1,7 +1,7 @@
|
||||||
pkgbase = libqtxdg
|
pkgbase = libqtxdg
|
||||||
pkgdesc = Library providing freedesktop.org XDG specs implementations for Qt
|
pkgdesc = Library providing freedesktop.org XDG specs implementations for Qt
|
||||||
pkgver = 4.0.0
|
pkgver = 4.0.1
|
||||||
pkgrel = 5
|
pkgrel = 1
|
||||||
url = https://github.com/lxqt/libqtxdg
|
url = https://github.com/lxqt/libqtxdg
|
||||||
arch = x86_64
|
arch = x86_64
|
||||||
license = LGPL
|
license = LGPL
|
||||||
|
|
@ -16,14 +16,12 @@ pkgbase = libqtxdg
|
||||||
optdepends = xterm: the default terminal for running .desktop files
|
optdepends = xterm: the default terminal for running .desktop files
|
||||||
provides = libQt6Xdg.so
|
provides = libQt6Xdg.so
|
||||||
provides = libQt6XdgIconLoader.so
|
provides = libQt6XdgIconLoader.so
|
||||||
source = https://github.com/lxqt/libqtxdg/releases/download/4.0.0/libqtxdg-4.0.0.tar.xz
|
source = https://github.com/lxqt/libqtxdg/releases/download/4.0.1/libqtxdg-4.0.1.tar.xz
|
||||||
source = https://github.com/lxqt/libqtxdg/releases/download/4.0.0/libqtxdg-4.0.0.tar.xz.asc
|
source = https://github.com/lxqt/libqtxdg/releases/download/4.0.1/libqtxdg-4.0.1.tar.xz.asc
|
||||||
source = qt-6.8.patch
|
|
||||||
validpgpkeys = 169704C6FB490C6892C7F23C37E0AF1FDA48F373
|
validpgpkeys = 169704C6FB490C6892C7F23C37E0AF1FDA48F373
|
||||||
validpgpkeys = 7C733BA5F585AAD669E4D23A42C9C8D3AF5EA5E3
|
validpgpkeys = 7C733BA5F585AAD669E4D23A42C9C8D3AF5EA5E3
|
||||||
validpgpkeys = 19DFDF3A579BD509DBB572D8BE793007AD22DF7E
|
validpgpkeys = 19DFDF3A579BD509DBB572D8BE793007AD22DF7E
|
||||||
sha256sums = 8c1b250de914b2e1fb451c213ee6f249b7b5729c85ac3283fd75615a47a66b62
|
sha256sums = cd9efd93dcfb8c337dbaca715c71666f7f05ff6a7702fde27526a34cce91b88c
|
||||||
sha256sums = SKIP
|
sha256sums = SKIP
|
||||||
sha256sums = c0871facc5ec8a4254b06d6b82e42f199a4294dced5f6fdcf8de31a060878b41
|
|
||||||
|
|
||||||
pkgname = libqtxdg
|
pkgname = libqtxdg
|
||||||
|
|
|
||||||
|
|
@ -5,8 +5,8 @@
|
||||||
# - patch to disable LTO
|
# - patch to disable LTO
|
||||||
|
|
||||||
pkgname=libqtxdg
|
pkgname=libqtxdg
|
||||||
pkgver=4.0.0
|
pkgver=4.0.1
|
||||||
pkgrel=5
|
pkgrel=1
|
||||||
pkgdesc="Library providing freedesktop.org XDG specs implementations for Qt"
|
pkgdesc="Library providing freedesktop.org XDG specs implementations for Qt"
|
||||||
arch=("x86_64")
|
arch=("x86_64")
|
||||||
url="https://github.com/lxqt/$pkgname"
|
url="https://github.com/lxqt/$pkgname"
|
||||||
|
|
@ -21,12 +21,10 @@ provides=("libQt6Xdg.so" "libQt6XdgIconLoader.so")
|
||||||
source=(
|
source=(
|
||||||
"https://github.com/lxqt/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.xz"
|
"https://github.com/lxqt/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.xz"
|
||||||
"https://github.com/lxqt/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.xz.asc"
|
"https://github.com/lxqt/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.xz.asc"
|
||||||
qt-6.8.patch
|
|
||||||
'0001-disable-LTO.patch'
|
'0001-disable-LTO.patch'
|
||||||
)
|
)
|
||||||
sha256sums=('8c1b250de914b2e1fb451c213ee6f249b7b5729c85ac3283fd75615a47a66b62'
|
sha256sums=('cd9efd93dcfb8c337dbaca715c71666f7f05ff6a7702fde27526a34cce91b88c'
|
||||||
'SKIP'
|
'SKIP'
|
||||||
'c0871facc5ec8a4254b06d6b82e42f199a4294dced5f6fdcf8de31a060878b41'
|
|
||||||
'36061244c5f0822a9724f8d4a614673a52a6bd95979f7b0b746e206319ccef5f')
|
'36061244c5f0822a9724f8d4a614673a52a6bd95979f7b0b746e206319ccef5f')
|
||||||
validpgpkeys=(
|
validpgpkeys=(
|
||||||
"169704C6FB490C6892C7F23C37E0AF1FDA48F373" # Jerome Leclanche <jerome@leclan.ch>
|
"169704C6FB490C6892C7F23C37E0AF1FDA48F373" # Jerome Leclanche <jerome@leclan.ch>
|
||||||
|
|
@ -36,7 +34,6 @@ validpgpkeys=(
|
||||||
|
|
||||||
prepare() {
|
prepare() {
|
||||||
cd $pkgname-$pkgver
|
cd $pkgname-$pkgver
|
||||||
patch -p1 -i ../qt-6.8.patch
|
|
||||||
patch -p1 -i ../0001-disable-LTO.patch
|
patch -p1 -i ../0001-disable-LTO.patch
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,326 +0,0 @@
|
||||||
From 37348365b127b5a3335e68a1807de34acc0caf7e Mon Sep 17 00:00:00 2001
|
|
||||||
From: Tsu Jan <tsujan2000@gmail.com>
|
|
||||||
Date: Sat, 14 Sep 2024 00:36:02 +0330
|
|
||||||
Subject: [PATCH 1/2] =?UTF-8?q?Fix=20compilation=20with=20Qt=20=E2=89=A5?=
|
|
||||||
=?UTF-8?q?=206.8?=
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
Closes https://github.com/lxqt/libqtxdg/issues/306
|
|
||||||
---
|
|
||||||
src/qtxdg/xdgmimetype.h | 4 +-
|
|
||||||
src/xdgiconloader/xdgiconloader.cpp | 93 ++++++++++++++++++++++++++---
|
|
||||||
src/xdgiconloader/xdgiconloader_p.h | 4 ++
|
|
||||||
3 files changed, 92 insertions(+), 9 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/qtxdg/xdgmimetype.h b/src/qtxdg/xdgmimetype.h
|
|
||||||
index 7bca798..59e53bd 100644
|
|
||||||
--- a/src/qtxdg/xdgmimetype.h
|
|
||||||
+++ b/src/qtxdg/xdgmimetype.h
|
|
||||||
@@ -72,12 +72,12 @@ class QTXDG_API XdgMimeType : public QMimeType {
|
|
||||||
*/
|
|
||||||
bool operator==(const XdgMimeType &other) const
|
|
||||||
{
|
|
||||||
- return QMimeType::operator==(other);
|
|
||||||
+ return name() == other.name();
|
|
||||||
}
|
|
||||||
|
|
||||||
inline bool operator!=(const XdgMimeType &other) const
|
|
||||||
{
|
|
||||||
- return !QMimeType::operator==(other);
|
|
||||||
+ return !operator==(other);
|
|
||||||
}
|
|
||||||
|
|
||||||
void swap(XdgMimeType &other) noexcept;
|
|
||||||
diff --git a/src/xdgiconloader/xdgiconloader.cpp b/src/xdgiconloader/xdgiconloader.cpp
|
|
||||||
index 1c040c2..c6967a0 100644
|
|
||||||
--- a/src/xdgiconloader/xdgiconloader.cpp
|
|
||||||
+++ b/src/xdgiconloader/xdgiconloader.cpp
|
|
||||||
@@ -757,7 +757,11 @@ QSize XdgIconLoaderEngine::actualSize(const QSize &size, QIcon::Mode mode,
|
|
||||||
}
|
|
||||||
|
|
||||||
// XXX: duplicated from qiconloader.cpp, because this symbol isn't exported :(
|
|
||||||
+#if (QT_VERSION >= QT_VERSION_CHECK(6,8,0))
|
|
||||||
+QPixmap PixmapEntry::pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state, qreal scale)
|
|
||||||
+#else
|
|
||||||
QPixmap PixmapEntry::pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state)
|
|
||||||
+#endif
|
|
||||||
{
|
|
||||||
Q_UNUSED(state);
|
|
||||||
|
|
||||||
@@ -766,18 +770,46 @@ QPixmap PixmapEntry::pixmap(const QSize &size, QIcon::Mode mode, QIcon::State st
|
|
||||||
if (basePixmap.isNull())
|
|
||||||
basePixmap.load(filename);
|
|
||||||
|
|
||||||
+ // see QPixmapIconEngine::adjustSize
|
|
||||||
QSize actualSize = basePixmap.size();
|
|
||||||
// If the size of the best match we have (basePixmap) is larger than the
|
|
||||||
// requested size, we downscale it to match.
|
|
||||||
if (!actualSize.isNull() && (actualSize.width() > size.width() || actualSize.height() > size.height()))
|
|
||||||
actualSize.scale(size, Qt::KeepAspectRatio);
|
|
||||||
|
|
||||||
+#if (QT_VERSION >= QT_VERSION_CHECK(6,8,0))
|
|
||||||
+ // see QIconPrivate::pixmapDevicePixelRatio
|
|
||||||
+ qreal calculatedDpr;
|
|
||||||
+ QSize targetSize = size * scale;
|
|
||||||
+ if ((actualSize.width() == targetSize.width() && actualSize.height() <= targetSize.height()) ||
|
|
||||||
+ (actualSize.width() <= targetSize.width() && actualSize.height() == targetSize.height()))
|
|
||||||
+ {
|
|
||||||
+ // Correctly scaled for dpr, just having different aspect ratio
|
|
||||||
+ calculatedDpr = scale;
|
|
||||||
+ }
|
|
||||||
+ else
|
|
||||||
+ {
|
|
||||||
+ qreal ratio = 0.5 * (qreal(actualSize.width()) / qreal(targetSize.width()) +
|
|
||||||
+ qreal(actualSize.height() / qreal(targetSize.height())));
|
|
||||||
+ calculatedDpr = qMax(qreal(1.0), scale * ratio);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+ QString key = QLatin1String("$qt_theme_")
|
|
||||||
+ % HexString<quint64>(basePixmap.cacheKey())
|
|
||||||
+ % HexString<quint8>(mode)
|
|
||||||
+ % HexString<quint64>(QGuiApplication::palette().cacheKey())
|
|
||||||
+ % HexString<uint>(actualSize.width())
|
|
||||||
+ % HexString<uint>(actualSize.height())
|
|
||||||
+ % HexString<quint16>(qRound(calculatedDpr * 1000));
|
|
||||||
+#else
|
|
||||||
QString key = QLatin1String("$qt_theme_")
|
|
||||||
% HexString<qint64>(basePixmap.cacheKey())
|
|
||||||
% HexString<int>(mode)
|
|
||||||
% HexString<qint64>(QGuiApplication::palette().cacheKey())
|
|
||||||
% HexString<int>(actualSize.width())
|
|
||||||
% HexString<int>(actualSize.height());
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
QPixmap cachedPixmap;
|
|
||||||
if (QPixmapCache::find(key, &cachedPixmap)) {
|
|
||||||
@@ -789,6 +821,9 @@ QPixmap PixmapEntry::pixmap(const QSize &size, QIcon::Mode mode, QIcon::State st
|
|
||||||
cachedPixmap = basePixmap;
|
|
||||||
if (QGuiApplication *guiApp = qobject_cast<QGuiApplication *>(qApp))
|
|
||||||
cachedPixmap = static_cast<QGuiApplicationPrivate*>(QObjectPrivate::get(guiApp))->applyQIconStyleHelper(mode, cachedPixmap);
|
|
||||||
+#if (QT_VERSION >= QT_VERSION_CHECK(6,8,0))
|
|
||||||
+ cachedPixmap.setDevicePixelRatio(calculatedDpr);
|
|
||||||
+#endif
|
|
||||||
QPixmapCache::insert(key, cachedPixmap);
|
|
||||||
}
|
|
||||||
return cachedPixmap;
|
|
||||||
@@ -796,21 +831,39 @@ QPixmap PixmapEntry::pixmap(const QSize &size, QIcon::Mode mode, QIcon::State st
|
|
||||||
|
|
||||||
// NOTE: For SVG, QSvgRenderer is used to prevent our icon handling from
|
|
||||||
// being broken by icon engines that register themselves for SVG.
|
|
||||||
+#if (QT_VERSION >= QT_VERSION_CHECK(6,8,0))
|
|
||||||
+QPixmap ScalableEntry::pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state, qreal scale)
|
|
||||||
+#else
|
|
||||||
QPixmap ScalableEntry::pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state)
|
|
||||||
+#endif
|
|
||||||
{
|
|
||||||
QPixmap pm;
|
|
||||||
if (size.isEmpty())
|
|
||||||
return pm;
|
|
||||||
|
|
||||||
+#if (QT_VERSION >= QT_VERSION_CHECK(6,8,0))
|
|
||||||
+ QString key = QLatin1String("lxqt_")
|
|
||||||
+ % filename
|
|
||||||
+ % HexString<quint8>(mode)
|
|
||||||
+ % HexString<int>(state)
|
|
||||||
+ % HexString<uint>(size.width())
|
|
||||||
+ % HexString<uint>(size.height())
|
|
||||||
+ % HexString<quint16>(qRound(scale * 1000));
|
|
||||||
+#else
|
|
||||||
QString key = QLatin1String("lxqt_")
|
|
||||||
% filename
|
|
||||||
% HexString<int>(mode)
|
|
||||||
% HexString<int>(state)
|
|
||||||
% HexString<int>(size.width())
|
|
||||||
% HexString<int>(size.height());
|
|
||||||
+#endif
|
|
||||||
if (!QPixmapCache::find(key, &pm))
|
|
||||||
{
|
|
||||||
+#if (QT_VERSION >= QT_VERSION_CHECK(6,8,0))
|
|
||||||
+ int icnSize = qMin(size.width(), size.height()) * scale;
|
|
||||||
+#else
|
|
||||||
int icnSize = qMin(size.width(), size.height());
|
|
||||||
+#endif
|
|
||||||
pm = QPixmap(icnSize, icnSize);
|
|
||||||
pm.fill(Qt::transparent);
|
|
||||||
|
|
||||||
@@ -824,8 +877,12 @@ QPixmap ScalableEntry::pixmap(const QSize &size, QIcon::Mode mode, QIcon::State
|
|
||||||
}
|
|
||||||
|
|
||||||
svgIcon = QIcon(pm);
|
|
||||||
+#if (QT_VERSION >= QT_VERSION_CHECK(6,8,0))
|
|
||||||
+ pm = svgIcon.pixmap(size, scale, mode, state);
|
|
||||||
+#else
|
|
||||||
if (QIconEngine *engine = svgIcon.data_ptr() ? svgIcon.data_ptr()->engine : nullptr)
|
|
||||||
pm = engine->pixmap(size, mode, state);
|
|
||||||
+#endif
|
|
||||||
QPixmapCache::insert(key, pm);
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -838,7 +895,11 @@ static const QString STYLE = QStringLiteral("\n.ColorScheme-Text, .ColorScheme-N
|
|
||||||
// NOTE: Qt palette does not have any colors for positive/negative text
|
|
||||||
// .ColorScheme-PositiveText,ColorScheme-NegativeText {color:%4;}
|
|
||||||
|
|
||||||
+#if (QT_VERSION >= QT_VERSION_CHECK(6,8,0))
|
|
||||||
+QPixmap ScalableFollowsColorEntry::pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state, qreal scale)
|
|
||||||
+#else
|
|
||||||
QPixmap ScalableFollowsColorEntry::pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state)
|
|
||||||
+#endif
|
|
||||||
{
|
|
||||||
QPixmap pm;
|
|
||||||
if (size.isEmpty())
|
|
||||||
@@ -866,6 +927,16 @@ QPixmap ScalableFollowsColorEntry::pixmap(const QSize &size, QIcon::Mode mode, Q
|
|
||||||
}
|
|
||||||
hCol = pal.highlight().color().name();
|
|
||||||
}
|
|
||||||
+#if (QT_VERSION >= QT_VERSION_CHECK(6,8,0))
|
|
||||||
+ QString key = QLatin1String("lxqt_")
|
|
||||||
+ % filename
|
|
||||||
+ % HexString<quint8>(mode)
|
|
||||||
+ % HexString<int>(state)
|
|
||||||
+ % HexString<uint>(size.width())
|
|
||||||
+ % HexString<uint>(size.height())
|
|
||||||
+ % HexString<quint16>(qRound(scale * 1000))
|
|
||||||
+ % txtCol % bgCol % hCol;
|
|
||||||
+#else
|
|
||||||
QString key = QLatin1String("lxqt_")
|
|
||||||
% filename
|
|
||||||
% HexString<int>(mode)
|
|
||||||
@@ -873,9 +944,14 @@ QPixmap ScalableFollowsColorEntry::pixmap(const QSize &size, QIcon::Mode mode, Q
|
|
||||||
% HexString<int>(size.width())
|
|
||||||
% HexString<int>(size.height())
|
|
||||||
% txtCol % bgCol % hCol;
|
|
||||||
+#endif
|
|
||||||
if (!QPixmapCache::find(key, &pm))
|
|
||||||
{
|
|
||||||
+#if (QT_VERSION >= QT_VERSION_CHECK(6,8,0))
|
|
||||||
+ int icnSize = qMin(size.width(), size.height()) * scale;
|
|
||||||
+#else
|
|
||||||
int icnSize = qMin(size.width(), size.height());
|
|
||||||
+#endif
|
|
||||||
pm = QPixmap(icnSize, icnSize);
|
|
||||||
pm.fill(Qt::transparent);
|
|
||||||
|
|
||||||
@@ -926,8 +1002,12 @@ QPixmap ScalableFollowsColorEntry::pixmap(const QSize &size, QIcon::Mode mode, Q
|
|
||||||
// for QIcon::pixmap() to handle states and modes,
|
|
||||||
// especially the disabled mode.
|
|
||||||
svgIcon = QIcon(pm);
|
|
||||||
+#if (QT_VERSION >= QT_VERSION_CHECK(6,8,0))
|
|
||||||
+ pm = svgIcon.pixmap(size, scale, mode, state);
|
|
||||||
+#else
|
|
||||||
if (QIconEngine *engine = svgIcon.data_ptr() ? svgIcon.data_ptr()->engine : nullptr)
|
|
||||||
pm = engine->pixmap(size, mode, state);
|
|
||||||
+#endif
|
|
||||||
QPixmapCache::insert(key, pm);
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -937,13 +1017,7 @@ QPixmap ScalableFollowsColorEntry::pixmap(const QSize &size, QIcon::Mode mode, Q
|
|
||||||
QPixmap XdgIconLoaderEngine::pixmap(const QSize &size, QIcon::Mode mode,
|
|
||||||
QIcon::State state)
|
|
||||||
{
|
|
||||||
- ensureLoaded();
|
|
||||||
-
|
|
||||||
- QIconLoaderEngineEntry *entry = entryForSize(m_info, size);
|
|
||||||
- if (entry)
|
|
||||||
- return entry->pixmap(size, mode, state);
|
|
||||||
-
|
|
||||||
- return QPixmap();
|
|
||||||
+ return scaledPixmap(size, mode, state, 1.0);
|
|
||||||
}
|
|
||||||
|
|
||||||
QString XdgIconLoaderEngine::key() const
|
|
||||||
@@ -967,8 +1041,13 @@ QPixmap XdgIconLoaderEngine::scaledPixmap(const QSize &size, QIcon::Mode mode, Q
|
|
||||||
{
|
|
||||||
ensureLoaded();
|
|
||||||
const int integerScale = qCeil(scale);
|
|
||||||
+#if (QT_VERSION >= QT_VERSION_CHECK(6,8,0))
|
|
||||||
+ QIconLoaderEngineEntry *entry = entryForSize(m_info, size, integerScale);
|
|
||||||
+ return entry ? entry->pixmap(size, mode, state, scale) : QPixmap();
|
|
||||||
+#else
|
|
||||||
QIconLoaderEngineEntry *entry = entryForSize(m_info, size / integerScale, integerScale);
|
|
||||||
return entry ? entry->pixmap(size, mode, state) : QPixmap();
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
QList<QSize> XdgIconLoaderEngine::availableSizes(QIcon::Mode mode, QIcon::State state)
|
|
||||||
diff --git a/src/xdgiconloader/xdgiconloader_p.h b/src/xdgiconloader/xdgiconloader_p.h
|
|
||||||
index 7fc9896..6c5f17f 100644
|
|
||||||
--- a/src/xdgiconloader/xdgiconloader_p.h
|
|
||||||
+++ b/src/xdgiconloader/xdgiconloader_p.h
|
|
||||||
@@ -63,7 +63,11 @@ class XdgIconLoader;
|
|
||||||
|
|
||||||
struct ScalableFollowsColorEntry : public ScalableEntry
|
|
||||||
{
|
|
||||||
+#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
|
|
||||||
};
|
|
||||||
|
|
||||||
//class QIconLoaderEngine : public QIconEngine
|
|
||||||
|
|
||||||
From 639b1c454becc28b66fc7175ba0d709977e17c83 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Tsu Jan <tsujan2000@gmail.com>
|
|
||||||
Date: Sat, 14 Sep 2024 17:26:43 +0330
|
|
||||||
Subject: [PATCH 2/2] Updated `QDomDocument::setContent`
|
|
||||||
|
|
||||||
---
|
|
||||||
src/qtxdg/xdgmenu.cpp | 2 +-
|
|
||||||
src/qtxdg/xdgmenureader.cpp | 13 +++++--------
|
|
||||||
src/xdgiconloader/xdgiconloader.cpp | 1 -
|
|
||||||
3 files changed, 6 insertions(+), 10 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/qtxdg/xdgmenu.cpp b/src/qtxdg/xdgmenu.cpp
|
|
||||||
index 36a9169..fbb579c 100644
|
|
||||||
--- a/src/qtxdg/xdgmenu.cpp
|
|
||||||
+++ b/src/qtxdg/xdgmenu.cpp
|
|
||||||
@@ -227,7 +227,7 @@ void XdgMenuPrivate::load(const QString& fileName)
|
|
||||||
qWarning() << QString::fromLatin1("%1 not loading: %2").arg(fileName, file.errorString());
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
- mXml.setContent(&file, true);
|
|
||||||
+ mXml.setContent(&file, QDomDocument::ParseOption::UseNamespaceProcessing);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/qtxdg/xdgmenureader.cpp b/src/qtxdg/xdgmenureader.cpp
|
|
||||||
index ede9c7b..8424bdc 100644
|
|
||||||
--- a/src/qtxdg/xdgmenureader.cpp
|
|
||||||
+++ b/src/qtxdg/xdgmenureader.cpp
|
|
||||||
@@ -79,16 +79,13 @@ bool XdgMenuReader::load(const QString& fileName, const QString& baseDir)
|
|
||||||
//qDebug() << "Load file:" << mFileName;
|
|
||||||
mMenu->addWatchPath(mFileName);
|
|
||||||
|
|
||||||
- QString errorStr;
|
|
||||||
- int errorLine;
|
|
||||||
- int errorColumn;
|
|
||||||
-
|
|
||||||
- if (!mXml.setContent(&file, true, &errorStr, &errorLine, &errorColumn))
|
|
||||||
+ QDomDocument::ParseResult res = mXml.setContent(&file, QDomDocument::ParseOption::UseNamespaceProcessing);
|
|
||||||
+ if (!res)
|
|
||||||
{
|
|
||||||
mErrorStr = QString::fromLatin1("Parse error at line %1, column %2:\n%3")
|
|
||||||
- .arg(errorLine)
|
|
||||||
- .arg(errorColumn)
|
|
||||||
- .arg(errorStr);
|
|
||||||
+ .arg(res.errorLine)
|
|
||||||
+ .arg(res.errorColumn)
|
|
||||||
+ .arg(res.errorMessage);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/src/xdgiconloader/xdgiconloader.cpp b/src/xdgiconloader/xdgiconloader.cpp
|
|
||||||
index c6967a0..c299cca 100644
|
|
||||||
--- a/src/xdgiconloader/xdgiconloader.cpp
|
|
||||||
+++ b/src/xdgiconloader/xdgiconloader.cpp
|
|
||||||
@@ -794,7 +794,6 @@ QPixmap PixmapEntry::pixmap(const QSize &size, QIcon::Mode mode, QIcon::State st
|
|
||||||
calculatedDpr = qMax(qreal(1.0), scale * ratio);
|
|
||||||
}
|
|
||||||
|
|
||||||
-
|
|
||||||
QString key = QLatin1String("$qt_theme_")
|
|
||||||
% HexString<quint64>(basePixmap.cacheKey())
|
|
||||||
% HexString<quint8>(mode)
|
|
||||||
Loading…
Reference in a new issue