AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix QPrinter::setPaperSize regression when using QPrinter::DevicePixel

Browse Source 
The QPageSize-based refactoring led to casting DevicePixel to a QPageSize::Unit
value of 6 (out of bounds). And then the switch in qt_nameForCustomSize
would leave the string empty, leading to "QString::arg: Argument missing: , 672"
warnings.

Change-Id: I85e97174cc8ead9beccaaa3ded6edfad80f8e360
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
This commit is contained in:
David Faure 2014-12-29 16:37:55 +01:00 committed by Marc Mutz
parent 20480070a6
commit 7fc8c560e2
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/printsupport/kernel/qprinter.cpp
View File

@ -1224,7 +1224,10 @@ void QPrinter::setPageSize(PageSize newPageSize)
void QPrinter::setPaperSize(const QSizeF &paperSize, QPrinter::Unit unit)
{
setPageSize(QPageSize(paperSize, QPageSize::Unit(unit)));
if (unit == QPrinter::DevicePixel)
setPageSize(QPageSize(paperSize * qt_pixelMultiplier(resolution()), QPageSize::Point));
else
setPageSize(QPageSize(paperSize, QPageSize::Unit(unit)));
}
/*!

12
tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp
View File

@ -526,7 +526,7 @@ void tst_QPrinter::testCustomPageSizes()
{
QPrinter p;
QSizeF customSize(8.5, 11.0);
QSizeF customSize(7.0, 11.0);
p.setPaperSize(customSize, QPrinter::Inch);
QSizeF paperSize = p.paperSize(QPrinter::Inch);
@ -538,6 +538,16 @@ void tst_QPrinter::testCustomPageSizes()
paperSize = p.paperSize(QPrinter::Inch);
QCOMPARE(paperSize.width(), customSize.width());
QCOMPARE(paperSize.height(), customSize.height());
const QSizeF sizeInPixels = p.paperSize(QPrinter::DevicePixel);
QPrinter p3;
p3.setPaperSize(sizeInPixels, QPrinter::DevicePixel);
paperSize = p3.paperSize(QPrinter::Inch);
QCOMPARE(paperSize.width(), customSize.width());
QCOMPARE(paperSize.height(), customSize.height());
QPageSize pageSize = p3.pageLayout().pageSize();
QCOMPARE(pageSize.key(), QString("Custom.504x792"));
QCOMPARE(pageSize.name(), QString("Custom (504pt x 792pt)"));
}
void tst_QPrinter::customPaperSizeAndMargins_data()