mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2025-11-25 16:38:06 +03:00
Code Activity

Merge tag '1.6.0' into develop

Browse Source 
Finish 1.6.0
This commit is contained in:
fralx
2021-12-24 15:49:36 +03:00
parent 10060fa07f 8dab5f6870
commit 94a613f963
47 changed files with 823 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
limereport/lrpreviewreportwidget.cpp
View File

@@ -143,7 +143,7 @@ void PreviewReportWidget::initPreview()
{
if (ui->graphicsView->scene()!=d_ptr->m_previewPage)
ui->graphicsView->setScene(d_ptr->m_previewPage);
#if QT_VERSION < 0x060000
#if (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))
ui->graphicsView->resetMatrix();
#else
ui->graphicsView->resetTransform();
@@ -309,7 +309,7 @@ void PreviewReportWidget::saveToFile()
void PreviewReportWidget::setScalePercent(int percent)
{
m_scaleChanging = true;
#if QT_VERSION < 0x060000
#if (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))
ui->graphicsView->resetMatrix();
#else
ui->graphicsView->resetTransform();
@@ -492,7 +492,7 @@ void PreviewReportWidget::reportEngineDestroyed(QObject *object)
void PreviewReportWidget::slotZoomed(double )
{
#if QT_VERSION < 0x060000
#if (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))
d_ptr->m_scalePercent = ui->graphicsView->matrix().m11()*100;
#else
d_ptr->m_scalePercent = ui->graphicsView->transform().m11()*100;