6.5.3 clean

This commit is contained in:
kleuter
2023-11-01 18:02:52 +01:00
parent bbe896803b
commit 7018d9e6c8
2170 changed files with 57471 additions and 43550 deletions

View File

@ -0,0 +1,5 @@
# QTBUG-87429
[testSignals]
android
[setMimeData]
android

View File

@ -41,6 +41,7 @@ private slots:
void testSignals();
void setMimeData();
void clearBeforeSetText();
void getTextFromHTMLMimeType();
# ifdef Q_OS_WIN
void testWindowsMimeRegisterType();
void testWindowsMime_data();
@ -61,7 +62,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 +425,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;