diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-21 17:32:39 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-21 17:33:15 +0200 |
| commit | a5d34b34fbd867bd13ce94cdaf55d96576d4d14d (patch) | |
| tree | bb3b8b902f13bda65e49485a789f0eca07329ab5 /tests/auto/gui/text | |
| parent | 5957f245c6c77c98d7e90d614c9fe2cdbfe7e8e6 (diff) | |
| parent | a23ff58d716f62b02ec825a3ea3c6b07616ee3f0 (diff) | |
Merge branch 'stable' into dev
Change-Id: I37d85631ab1165ab91457d8880c4da907a9df73b
Diffstat (limited to 'tests/auto/gui/text')
| -rw-r--r-- | tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp b/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp index 6c56d3c2fa..90137079f3 100644 --- a/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp +++ b/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp @@ -1587,6 +1587,8 @@ void tst_QTextLayout::testTabDPIScale() case QPaintDevice::PdmPhysicalDpiX: case QPaintDevice::PdmPhysicalDpiY: return 72; + case QPaintDevice::PdmDevicePixelRatio: + ; // fall through } return 0; } |