1 files changed, 22 insertions, 2 deletions
diff --git a/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp b/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp
index 0b694bff73..30366c6aa1 100644
--- a/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp
+++ b/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 
 #include <QTest>
@@ -23,6 +23,7 @@
 #  include <QtGui/private/qguiapplication_p.h>
 #  include <QtGui/qwindowsmimeconverter.h>
 #  include <QtGui/qpa/qplatformintegration.h>
+#  include <QtCore/qt_windows.h>
 #endif
 
 class tst_QClipboard : public QObject
@@ -41,6 +42,7 @@ private slots:
     void testSignals();
     void setMimeData();
     void clearBeforeSetText();
+    void getTextFromHTMLMimeType();
 #  ifdef Q_OS_WIN
     void testWindowsMimeRegisterType();
     void testWindowsMime_data();
@@ -61,7 +63,7 @@ void tst_QClipboard::initTestCase()
 #if QT_CONFIG(clipboard)
 void tst_QClipboard::init()
 {
-#if QT_CONFIG(process)
+#if QT_CONFIG(process) && !defined(Q_OS_ANDROID)
     const QString testdataDir = QFileInfo(QFINDTESTDATA("copier")).absolutePath();
     QVERIFY2(QDir::setCurrent(testdataDir), qPrintable("Could not chdir to " + testdataDir));
 #endif
@@ -424,6 +426,24 @@ void tst_QClipboard::clearBeforeSetText()
     QCOMPARE(QGuiApplication::clipboard()->text(), text);
 }
 
+void tst_QClipboard::getTextFromHTMLMimeType()
+{
+    QClipboard * clipboard = QGuiApplication::clipboard();
+    QMimeData * mimeData = new QMimeData();
+    const QString testString("TEST");
+    const QString htmlString(QLatin1String("<html><body>") + testString + QLatin1String("</body></html>"));
+
+    mimeData->setText(testString);
+    mimeData->setHtml(htmlString);
+    clipboard->setMimeData(mimeData);
+
+    QCOMPARE(clipboard->text(), testString);
+    QVERIFY(clipboard->mimeData()->hasText());
+    QVERIFY(clipboard->mimeData()->hasHtml());
+    QCOMPARE(clipboard->mimeData()->text(), testString);
+    QCOMPARE(clipboard->mimeData()->html(), htmlString);
+}
+
 #  ifdef Q_OS_WIN
 
 using QWindowsMimeConverter = QWindowsMimeConverter;