diff options
| author | Oliver Wolff <oliver.wolff@qt.io> | 2020-06-05 09:24:37 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2020-06-06 20:25:49 +0200 |
| commit | 45b0f1be686cfba8dcecb9be5c875cae59c69276 (patch) | |
| tree | 363dfd46575d147206267d854ce14747157f432e /tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp | |
| parent | aa81b90738ce9faee5e433617c8bd243cb238729 (diff) | |
Remove winrt
Macros and the await helper function from qfunctions_winrt(_p).h are
needed in other Qt modules which use UWP APIs on desktop windows.
Task-number: QTBUG-84434
Change-Id: Ice09c11436ad151c17bdccd2c7defadd08c13925
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp')
| -rw-r--r-- | tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp b/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp index 2f5936cf74..8a12057527 100644 --- a/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp +++ b/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp @@ -1709,9 +1709,6 @@ void tst_QTextDocumentFragment::html_bodyBackground() const char html[] = "<body background=\"foo.png\">Foo</body>"; doc->setHtml(html); -#ifdef Q_OS_WINRT - QEXPECT_FAIL("", "Fails on winrt. Investigate - QTBUG-68297", Continue); -#endif QCOMPARE(doc->rootFrame()->frameFormat().background().style(), Qt::TexturePattern); } @@ -1726,9 +1723,6 @@ void tst_QTextDocumentFragment::html_tableCellBackground() QVERIFY(table); QTextTableCell cell = table->cellAt(0, 0); -#ifdef Q_OS_WINRT - QEXPECT_FAIL("", "Fails on winrt. Investigate - QTBUG-68297", Continue); -#endif QCOMPARE(cell.format().background().style(), Qt::TexturePattern); } @@ -1737,9 +1731,6 @@ void tst_QTextDocumentFragment::css_bodyBackground() const char html[] = "<body style=\"background-image:url('foo.png')\">Foo</body>"; doc->setHtml(html); -#ifdef Q_OS_WINRT - QEXPECT_FAIL("", "Fails on winrt. Investigate - QTBUG-68297", Continue); -#endif QCOMPARE(doc->rootFrame()->frameFormat().background().style(), Qt::TexturePattern); } @@ -1754,9 +1745,6 @@ void tst_QTextDocumentFragment::css_tableCellBackground() QVERIFY(table); QTextTableCell cell = table->cellAt(0, 0); -#ifdef Q_OS_WINRT - QEXPECT_FAIL("", "Fails on winrt. Investigate - QTBUG-68297", Continue); -#endif QCOMPARE(cell.format().background().style(), Qt::TexturePattern); } |