|
[-]
[+]
|
Changed |
_service:tar_git:qtsvg.spec
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -2,6 +2,6 @@
<service name="tar_git">
<param name="url">https://github.com/sailfishos-chum/qtsvg.git</param>
<param name="branch"></param>
- <param name="revision">5.15.9+kde7</param>
+ <param name="revision">5.15.10+kde8</param>
</service>
</services>
|
|
[-]
[+]
|
Changed |
_service:tar_git:opt-qt5-qtsvg-5.15.10+kde8.tar.bz2/upstream/.qmake.conf
^
|
| @@ -3,4 +3,4 @@
CONFIG += warning_clean
DEFINES += QT_NO_FOREACH
-MODULE_VERSION = 5.15.9
+MODULE_VERSION = 5.15.10
|
|
[-]
[+]
|
Changed |
_service:tar_git:opt-qt5-qtsvg-5.15.10+kde8.tar.bz2/upstream/src/svg/qsvgfont_p.h
^
|
| @@ -74,6 +74,7 @@
class Q_SVG_PRIVATE_EXPORT QSvgFont : public QSvgRefCounted
{
public:
+ static constexpr qreal DEFAULT_UNITS_PER_EM = 1000;
QSvgFont(qreal horizAdvX);
void setFamilyName(const QString &name);
@@ -86,9 +87,7 @@
void draw(QPainter *p, const QPointF &point, const QString &str, qreal pixelSize, Qt::Alignment alignment) const;
public:
QString m_familyName;
- qreal m_unitsPerEm;
- qreal m_ascent;
- qreal m_descent;
+ qreal m_unitsPerEm = DEFAULT_UNITS_PER_EM;
qreal m_horizAdvX;
QHash<QChar, QSvgGlyph> m_glyphs;
};
|
|
[-]
[+]
|
Changed |
_service:tar_git:opt-qt5-qtsvg-5.15.10+kde8.tar.bz2/upstream/src/svg/qsvghandler.cpp
^
|
| @@ -2671,7 +2671,7 @@
qreal unitsPerEm = toDouble(unitsPerEmStr);
if (!unitsPerEm)
- unitsPerEm = 1000;
+ unitsPerEm = QSvgFont::DEFAULT_UNITS_PER_EM;
if (!name.isEmpty())
font->setFamilyName(name);
|
