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/qtextdocumentlayout/tst_qtextdocumentlayout.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/qtextdocumentlayout/tst_qtextdocumentlayout.cpp')
| -rw-r--r-- | tests/auto/gui/text/qtextdocumentlayout/tst_qtextdocumentlayout.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/tests/auto/gui/text/qtextdocumentlayout/tst_qtextdocumentlayout.cpp b/tests/auto/gui/text/qtextdocumentlayout/tst_qtextdocumentlayout.cpp index 4ed02ca658..d1495a2067 100644 --- a/tests/auto/gui/text/qtextdocumentlayout/tst_qtextdocumentlayout.cpp +++ b/tests/auto/gui/text/qtextdocumentlayout/tst_qtextdocumentlayout.cpp @@ -302,10 +302,6 @@ void tst_QTextDocumentLayout::imageAtRightAlignedTab() cursor.insertImage(imgFormat); // Everything should fit into the 300 pixels -#ifdef Q_OS_WINRT - QEXPECT_FAIL("", "Fails on winrt. Figure out why - QTBUG-68297", Continue); -#endif - qreal bearing = QFontMetricsF(doc->defaultFont()).rightBearing(QLatin1Char('t')); QCOMPARE(doc->idealWidth(), std::max(300.0, 300.0 - bearing)); } |