tellico/Use-unnamespaced-hex-for-Qt-lt-5.14.patch
Christophe Giboudeaux 6c062c5f4a Accepting request 796652 from home:wolfi323:branches:KDE:Extra
- Update to 3.3:
  Features:
  * Added new coin collection data source from Colnect.
  * Updated GiantBomb data source.
  * Updated IBS.it data source
  * Updated kino.de data source.
  * Updated Kinopoisk (КиноПоиск) data source.
  * Updated Kino-Teatr (Кино-Театр) data source.
  * Updated BiblioShare data source.
  * Updated TheGamesDB data source.
  * Updated Amazon data source. Access keys must be regenerated by
    users.
  * Updated MobyGames data source.
  * Improved z39.50 data source to allow separate character
    encoding for queries and responses (kde#419670).
  * Improved the audio file importing to include Album Artist
    (kde#419348).
  * Added PlayStation5 and Xbox Series X to recognized video game
    platforms.
  Bug Fixes:
  * Fixed bug with writing invalid XML names (kde#418067).
  * Updated AlloCiné and MusicBrainz data sources to provide
    notification that user agents must be enabled (kde#419309).
  * Improved MobyGames data source to cache platform data, allow
    user selection of image size, pass through error messages, and
    use more efficient API calls (kde#416718).
  * Improved the ISO-5426 character converter.
  * Updated python scripts to work in python2 or python3.
- Add patches to fix build with the lower Qt versions in Leap:
  * Use-unnamespaced-hex-for-Qt-lt-5.14.patch
  * Fix-build-with-Qt-5.9.patch

OBS-URL: https://build.opensuse.org/request/show/796652
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/tellico?expand=0&rev=57
2020-04-23 20:02:45 +00:00

31 lines
896 B
Diff

From aee9e90c1ce0257d12ea85029435db8ffa65a6a1 Mon Sep 17 00:00:00 2001
From: Pino Toscano <pino@kde.org>
Date: Thu, 23 Apr 2020 09:31:11 +0200
Subject: Use unnamespaced hex for Qt < 5.14
Qt 5.14 moves hex under a Qt namespace, so use it in the right way
depending on the Qt version.
---
src/utils/iso5426converter.cpp | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/utils/iso5426converter.cpp b/src/utils/iso5426converter.cpp
index 7ea81c7..0c19767 100644
--- a/src/utils/iso5426converter.cpp
+++ b/src/utils/iso5426converter.cpp
@@ -1211,7 +1211,11 @@ QChar Iso5426Converter::getCombiningChar(uint c) {
return 0x1EF1; // SMALL LETTER U WITH HORN AND DOT BELOW
default:
+#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
+ myDebug() << "no match for" << hex << c;
+#else
myDebug() << "no match for" << Qt::hex << c;
+#endif
return QChar();
}
}
--
cgit v1.1