Fix texteditor example for Android

Pick-to: 6.2 6.4
Fixes: QTBUG-103939
Change-Id: I60237f8cc58ebb6781a4df272fb7da13467d6640
Reviewed-by: Mitch Curtis <[email protected]>

2 files changed, 85 insertions, 0 deletions

diff --git a/examples/quickcontrols2/texteditor/documenthandler.cpp b/examples/quickcontrols2/texteditor/documenthandler.cpp
index a3a26f1ad4..9571aa03ba 100644
--- a/examples/quickcontrols2/texteditor/documenthandler.cpp
+++ b/examples/quickcontrols2/texteditor/documenthandler.cpp
@@ -276,4 +276,73 @@ void DocumentHandler::setFont(const QFont & font){
     emit fontChanged();
 }
 
+bool DocumentHandler::bold() const
+{
+    const QTextCursor cursor = textCursor();
+    if (cursor.isNull())
+        return m_document->textDocument()->defaultFont().bold();
+    return cursor.charFormat().font().bold();
+}
+
+void DocumentHandler::setBold(bool bold)
+{
+    const QTextCursor cursor = textCursor();
+    if (!cursor.isNull() && cursor.charFormat().font().bold() == bold)
+        return;
+
+    QFont font = cursor.charFormat().font();
+    font.setBold(bold);
+    QTextCharFormat format;
+    format.setFont(font);
+    mergeFormatOnWordOrSelection(format);
+
+    emit boldChanged();
+}
+
+bool DocumentHandler::underline() const
+{
+    const QTextCursor cursor = textCursor();
+    if (cursor.isNull())
+        return m_document->textDocument()->defaultFont().underline();
+    return cursor.charFormat().font().underline();
+}
+
+void DocumentHandler::setUnderline(bool underline)
+{
+    const QTextCursor cursor = textCursor();
+    if (!cursor.isNull() && cursor.charFormat().font().underline() == underline)
+        return;
+
+    QFont font = cursor.charFormat().font();
+    font.setUnderline(underline);
+    QTextCharFormat format;
+    format.setFont(font);
+    mergeFormatOnWordOrSelection(format);
+
+    emit underlineChanged();
+}
+
+bool DocumentHandler::italic() const
+{
+    const QTextCursor cursor = textCursor();
+    if (cursor.isNull())
+        return m_document->textDocument()->defaultFont().italic();
+    return cursor.charFormat().font().italic();
+}
+
+void DocumentHandler::setItalic(bool italic)
+{
+    const QTextCursor cursor = textCursor();
+    if (!cursor.isNull() && cursor.charFormat().font().italic() == italic)
+        return;
+
+    QFont font = cursor.charFormat().font();
+    font.setItalic(italic);
+    QTextCharFormat format;
+    format.setFont(font);
+    mergeFormatOnWordOrSelection(format);
+
+    emit italicChanged();
+}
+
 #include "moc_documenthandler.cpp"
diff --git a/examples/quickcontrols2/texteditor/documenthandler.h b/examples/quickcontrols2/texteditor/documenthandler.h
index c993748a5f..b750997885 100644
--- a/examples/quickcontrols2/texteditor/documenthandler.h
+++ b/examples/quickcontrols2/texteditor/documenthandler.h
@@ -28,6 +28,10 @@ class DocumentHandler : public QObject
 
     Q_PROPERTY(QFont font READ font WRITE setFont NOTIFY fontChanged)
 
+    Q_PROPERTY(bool bold READ bold WRITE setBold NOTIFY boldChanged)
+    Q_PROPERTY(bool underline READ underline WRITE setUnderline NOTIFY underlineChanged)
+    Q_PROPERTY(bool italic READ italic WRITE setItalic NOTIFY italicChanged)
+
     Q_PROPERTY(QString fileName READ fileName NOTIFY fileUrlChanged)
     Q_PROPERTY(QString fileType READ fileType NOTIFY fileUrlChanged)
     Q_PROPERTY(QUrl fileUrl READ fileUrl NOTIFY fileUrlChanged)
@@ -58,6 +62,15 @@ public:
     QFont font() const;
     void setFont(const QFont & font);
 
+    bool bold() const;
+    void setBold(bool bold);
+
+    bool underline() const;
+    void setUnderline(bool underline);
+
+    bool italic() const;
+    void setItalic(bool italic);
+
     QString fileName() const;
     QString fileType() const;
     QUrl fileUrl() const;
@@ -76,6 +89,9 @@ Q_SIGNALS:
     void selectionEndChanged();
 
     void fontChanged();
+    void boldChanged();
+    void underlineChanged();
+    void italicChanged();
     void textColorChanged();
     void alignmentChanged();