Merge branch 'branch-qt-5.15' into dev

This commit is contained in:
yifang 2022-01-27 08:24:21 +08:00
commit f1337862f1
2 changed files with 3 additions and 1 deletions

View file

@ -125,6 +125,7 @@ a:hover
padding-right: -1em;
padding-left: 0.3em;
-webkit-box-ordinal-group: 2;
height: 1em;
}
.gdexpandicon, .gdexpandicon:hover, .gdcollapseicon, .gdcollapseicon:hover

View file

@ -3413,7 +3413,8 @@ void MainWindow::on_pageSetup_triggered()
void MainWindow::on_printPreview_triggered()
{
QPrintPreviewDialog dialog( &getPrinter(), this );
QPrinter printer;
QPrintPreviewDialog dialog( &printer, this );
connect( &dialog, SIGNAL( paintRequested( QPrinter * ) ),
this, SLOT( printPreviewPaintRequested( QPrinter * ) ) );