[poppler] qt5/src qt6/src

[GitLab Mirror]

 qt5/src/poppler-annotation.cc |    3 +--
 qt5/src/poppler-annotation.h  |    4 ++--
 qt6/src/poppler-annotation.cc |    3 +--
 qt6/src/poppler-annotation.h  |    3 ++-
 4 files changed, 6 insertions(+), 7 deletions(-)

New commits:
commit ca724daf21a60900e6bb3d44e7b88c64990e4a21
Author: Albert Astals Cid <aacid at kde.org>
Date:   Wed Mar 2 16:44:56 2022 +0100

    qt: Annotations, don't change the text color when changing the font

diff --git a/qt5/src/poppler-annotation.cc b/qt5/src/poppler-annotation.cc
index cca9737b..ddb773d8 100644
--- a/qt5/src/poppler-annotation.cc
+++ b/qt5/src/poppler-annotation.cc
@@ -1832,7 +1832,7 @@ public:
     TextAnnotation::TextType textType;
     QString textIcon;
     std::optional<QFont> textFont;
-    QColor textColor;
+    QColor textColor = Qt::black;
     int inplaceAlign; // 0:left, 1:center, 2:right
     QVector<QPointF> inplaceCallout;
     TextAnnotation::InplaceIntent inplaceIntent;
@@ -2090,7 +2090,6 @@ void TextAnnotation::setTextFont(const QFont &font)
 {
     Q_D(TextAnnotation);
     d->textFont = font;
-    d->textColor = Qt::black;
 
     d->setDefaultAppearanceToNative();
 }
diff --git a/qt5/src/poppler-annotation.h b/qt5/src/poppler-annotation.h
index c8c4c6ac..00460f74 100644
--- a/qt5/src/poppler-annotation.h
+++ b/qt5/src/poppler-annotation.h
@@ -1,5 +1,5 @@
 /* poppler-annotation.h: qt interface to poppler
- * Copyright (C) 2006-2008, 2012, 2013, 2018-2021 Albert Astals Cid <aacid at kde.org>
+ * Copyright (C) 2006-2008, 2012, 2013, 2018-2022 Albert Astals Cid <aacid at kde.org>
  * Copyright (C) 2006, 2008 Pino Toscano <pino at kde.org>
  * Copyright (C) 2007, Brad Hards <bradh at frogmouth.net>
  * Copyright (C) 2010, Philip Lorenz <lorenzph+freedesktop at gmail.com>
@@ -562,7 +562,7 @@ public:
 
     QFont textFont() const;
     void setTextFont(const QFont &font);
-    /// \since 0.69
+    /// Default text color is black \since 0.69
     QColor textColor() const;
     /// \since 0.69
     void setTextColor(const QColor &color);
diff --git a/qt6/src/poppler-annotation.cc b/qt6/src/poppler-annotation.cc
index 43408bf3..c1c61259 100644
--- a/qt6/src/poppler-annotation.cc
+++ b/qt6/src/poppler-annotation.cc
@@ -1497,7 +1497,7 @@ public:
     TextAnnotation::TextType textType;
     QString textIcon;
     std::optional<QFont> textFont;
-    QColor textColor;
+    QColor textColor = Qt::black;
     TextAnnotation::InplaceAlignPosition inplaceAlign;
     QVector<QPointF> inplaceCallout;
     TextAnnotation::InplaceIntent inplaceIntent;
@@ -1661,7 +1661,6 @@ void TextAnnotation::setTextFont(const QFont &font)
 {
     Q_D(TextAnnotation);
     d->textFont = font;
-    d->textColor = Qt::black;
 
     d->setDefaultAppearanceToNative();
 }
diff --git a/qt6/src/poppler-annotation.h b/qt6/src/poppler-annotation.h
index 644c9167..16f2eda5 100644
--- a/qt6/src/poppler-annotation.h
+++ b/qt6/src/poppler-annotation.h
@@ -1,5 +1,5 @@
 /* poppler-annotation.h: qt interface to poppler
- * Copyright (C) 2006-2008, 2012, 2013, 2018-2021 Albert Astals Cid <aacid at kde.org>
+ * Copyright (C) 2006-2008, 2012, 2013, 2018-2022 Albert Astals Cid <aacid at kde.org>
  * Copyright (C) 2006, 2008 Pino Toscano <pino at kde.org>
  * Copyright (C) 2007, Brad Hards <bradh at frogmouth.net>
  * Copyright (C) 2010, Philip Lorenz <lorenzph+freedesktop at gmail.com>
@@ -518,6 +518,7 @@ public:
 
     QFont textFont() const;
     void setTextFont(const QFont &font);
+    /// Default text color is black
     QColor textColor() const;
     void setTextColor(const QColor &color);