Complete Qt6 migration: full clean build green across groups G1-G12 incl. runtime plugin set
new_docker_build.sh gains Group 12 (212 GUI/Data plugins); fixes LtsUtilsGuiDds visibility (LTO-stripped exports), LtsProjectionWorkstation unity name shadow, 6 unity-off dirs (dup file-scope statics, ddsftc INTERFACE sources) and reconfigures BUILD_FILTERMANAGEMENT/BUILD_PLUGINS_SERVICEMONITOR=ON
This commit is contained in:
1 parent
eb1d949edc
commit
815e16368e
1718 files changed
+126739
-18495
No files matched your search
@@ -50,8 +50,8 @@ Base::Base(QTextDocument &doc,
|
||||
QWidget *dialogParent,
|
||||
const QString &dialogTitle,
|
||||
const QString &_fn,
|
||||
QPrinter::PaperSize _ps,
|
||||
QPrinter::Orientation _or,
|
||||
QPageSize _ps,
|
||||
QPageLayout::Orientation _or,
|
||||
QPrinter::ColorMode _cm) : m_printer(new QPrinter),
|
||||
m_painter(new QPainter),
|
||||
m_iconFilenameNr(0),
|
||||
@@ -61,9 +61,9 @@ Base::Base(QTextDocument &doc,
|
||||
headersize_(10), headerrule_(0.5), headertext_(HeaderText),
|
||||
footersize_(10), footerrule_(0.5), footertext_(FooterText),
|
||||
itemFontSize_(2),
|
||||
m_settings(new NGL::Settings(NGL::findProjectConfigFile())).getNGLLogger("NGLPrinting")),
|
||||
m_currentPage(1),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
m_settings(new NGL::Settings(NGL::findProjectConfigFile())),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("NGLPrinting")),
|
||||
m_currentPage(1)
|
||||
{
|
||||
QString fn = _fn;
|
||||
fn = fn.remove(QLatin1Char(' '));
|
||||
@@ -77,8 +77,8 @@ Base::Base(QTextDocument &doc,
|
||||
#endif
|
||||
m_printer->setOutputFormat(QPrinter::NativeFormat);
|
||||
|
||||
m_printer->setPaperSize(_ps);
|
||||
m_printer->setOrientation(_or);
|
||||
m_printer->setPageSize(_ps);
|
||||
m_printer->setPageOrientation(_or);
|
||||
m_printer->setColorMode(_cm);
|
||||
|
||||
m_printer->setFullPage(true);
|
||||
@@ -101,13 +101,13 @@ Base::Base(QTextDocument &doc,
|
||||
QAbstractPrintDialog::PrintCollateCopies;
|
||||
dialog->setOptions(op);
|
||||
QString title = dialogTitle;
|
||||
if (_ps == QPrinter::A2)
|
||||
if (_ps.id() == QPageSize::A2)
|
||||
title += QLatin1String(" (A2)");
|
||||
if (_ps == QPrinter::A3)
|
||||
if (_ps.id() == QPageSize::A3)
|
||||
title += QLatin1String(" (A3)");
|
||||
if (_ps == QPrinter::A4)
|
||||
if (_ps.id() == QPageSize::A4)
|
||||
title += QLatin1String(" (A4)");
|
||||
if (_ps == QPrinter::A5)
|
||||
if (_ps.id() == QPageSize::A5)
|
||||
title += QLatin1String(" (A5)");
|
||||
dialog->setWindowTitle(title);
|
||||
if (dialog->exec() != QDialog::Accepted)
|
||||
@@ -153,7 +153,7 @@ QString Base::styleSheet()
|
||||
|
||||
QSize Base::printerPageSize() const
|
||||
{
|
||||
return QSize(m_printer->pageRect().width() - 2 * DOC_MARGIN, m_printer->pageRect().height() - 2 * DOC_MARGIN);
|
||||
return QSize(m_printer->pageRect(QPrinter::Point).width() - 2 * DOC_MARGIN, m_printer->pageRect(QPrinter::Point).height() - 2 * DOC_MARGIN);
|
||||
}
|
||||
|
||||
bool Base::newPage()
|
||||
@@ -543,7 +543,7 @@ bool Base::printItemData(QString& str, const QAbstractItemModel* model, const QM
|
||||
displayString += vdata.toString();
|
||||
|
||||
QString fgColorString;
|
||||
vdata = model->data(mi, Qt::TextColorRole);
|
||||
vdata = model->data(mi, Qt::ForegroundRole);
|
||||
if (vdata.isValid())
|
||||
fgColorString = vdata.value<QColor>().name();
|
||||
|
||||
@@ -684,24 +684,24 @@ bool Base::printReportData(QTextDocument& doc, KDReports::Report& report)
|
||||
return true;
|
||||
}
|
||||
|
||||
QPrinter::PageSize Base::pageSize() const
|
||||
QPageSize Base::pageSize() const
|
||||
{
|
||||
return m_printer->pageSize();
|
||||
return m_printer->pageLayout().pageSize();
|
||||
}
|
||||
|
||||
void Base::setPageSize(QPrinter::PageSize size)
|
||||
void Base::setPageSize(QPageSize size)
|
||||
{
|
||||
m_printer->setPageSize(size);
|
||||
}
|
||||
|
||||
QPrinter::Orientation Base::orientation() const
|
||||
QPageLayout::Orientation Base::orientation() const
|
||||
{
|
||||
return m_printer->orientation();
|
||||
return m_printer->pageLayout().orientation();
|
||||
}
|
||||
|
||||
void Base::setOrientation(QPrinter::Orientation orientation)
|
||||
void Base::setOrientation(QPageLayout::Orientation orientation)
|
||||
{
|
||||
m_printer->setOrientation(orientation);
|
||||
m_printer->setPageOrientation(orientation);
|
||||
}
|
||||
|
||||
double Base::leftMargin() const
|
||||
@@ -711,7 +711,7 @@ double Base::leftMargin() const
|
||||
|
||||
void Base::setLeftMargin(double margin)
|
||||
{
|
||||
if ((margin > 0) && (margin < m_printer->paperRect().width() / 2))
|
||||
if ((margin > 0) && (margin < m_printer->paperRect(QPrinter::Point).width() / 2))
|
||||
leftmargin_ = margin;
|
||||
else
|
||||
leftmargin_ = 0;
|
||||
@@ -724,7 +724,7 @@ double Base::rightMargin() const
|
||||
|
||||
void Base::setRightMargin(double margin)
|
||||
{
|
||||
if ((margin > 0) && (margin < m_printer->paperRect().width() / 2))
|
||||
if ((margin > 0) && (margin < m_printer->paperRect(QPrinter::Point).width() / 2))
|
||||
rightmargin_ = margin;
|
||||
else
|
||||
rightmargin_ = 0;
|
||||
@@ -737,7 +737,7 @@ double Base::topMargin() const
|
||||
|
||||
void Base::setTopMargin(double margin)
|
||||
{
|
||||
if ((margin > 0) && (margin < m_printer->paperRect().height() / 4))
|
||||
if ((margin > 0) && (margin < m_printer->paperRect(QPrinter::Point).height() / 4))
|
||||
topmargin_ = margin;
|
||||
else
|
||||
topmargin_ = 0;
|
||||
@@ -750,7 +750,7 @@ double Base::bottomMargin() const
|
||||
|
||||
void Base::setBottomMargin(double margin)
|
||||
{
|
||||
if ((margin > 0) && (margin < m_printer->paperRect().height() / 4))
|
||||
if ((margin > 0) && (margin < m_printer->paperRect(QPrinter::Point).height() / 4))
|
||||
bottommargin_ = margin;
|
||||
else
|
||||
bottommargin_ = 0;
|
||||
@@ -758,7 +758,7 @@ void Base::setBottomMargin(double margin)
|
||||
|
||||
void Base::setMargins(double margin)
|
||||
{
|
||||
if ((margin > 0) && (margin < m_printer->paperRect().height() / 2) && (margin < m_printer->paperRect().width() / 2))
|
||||
if ((margin > 0) && (margin < m_printer->paperRect(QPrinter::Point).height() / 2) && (margin < m_printer->paperRect(QPrinter::Point).width() / 2))
|
||||
leftmargin_ = rightmargin_ = topmargin_ = bottommargin_ = margin;
|
||||
else
|
||||
leftmargin_ = rightmargin_ = topmargin_ = bottommargin_ = 0;
|
||||
@@ -771,7 +771,7 @@ double Base::spacing() const
|
||||
|
||||
void Base::setSpacing(double spacing)
|
||||
{
|
||||
if ((spacing > 0) && (spacing <= m_printer->paperRect().height() / 8))
|
||||
if ((spacing > 0) && (spacing <= m_printer->paperRect(QPrinter::Point).height() / 8))
|
||||
spacing_ = spacing;
|
||||
else
|
||||
spacing_ = 0;
|
||||
@@ -784,7 +784,7 @@ double Base::headerSize() const
|
||||
|
||||
void Base::setHeaderSize(double size)
|
||||
{
|
||||
if ((size > 0) && (size <= m_printer->paperRect().height() / 8))
|
||||
if ((size > 0) && (size <= m_printer->paperRect(QPrinter::Point).height() / 8))
|
||||
headersize_ = size;
|
||||
else
|
||||
headersize_ = 0;
|
||||
@@ -817,7 +817,7 @@ double Base::footerSize() const
|
||||
|
||||
void Base::setFooterSize(double size)
|
||||
{
|
||||
if ((size > 0) && (size <= m_printer->paperRect().height() / 8))
|
||||
if ((size > 0) && (size <= m_printer->paperRect(QPrinter::Point).height() / 8))
|
||||
footersize_ = size;
|
||||
else
|
||||
footersize_ = 0;
|
||||
@@ -851,7 +851,7 @@ void Base::setItemFontSize(int itemFontSize)
|
||||
QRectF Base::paperRect(QPaintDevice* device)
|
||||
{
|
||||
|
||||
QRectF rect = m_printer->paperRect();
|
||||
QRectF rect = m_printer->paperRect(QPrinter::Point);
|
||||
|
||||
rect.setWidth(rect.width() * device->logicalDpiX() / m_printer->logicalDpiX());
|
||||
rect.setHeight(rect.height() * device->logicalDpiY() / m_printer->logicalDpiY());
|
||||
@@ -930,7 +930,7 @@ void Base::printSinglePage()
|
||||
m_tempdoc->setPageSize(contentRect(m_printer).size());
|
||||
|
||||
QTextFrameFormat fmt = m_tempdoc->rootFrame()->frameFormat();
|
||||
fmt.setContentsMargins(0, 0, 0, 0);
|
||||
fmt.setMargin(0);
|
||||
m_tempdoc->rootFrame()->setFrameFormat(fmt);
|
||||
|
||||
int doccopies;
|
||||
@@ -938,11 +938,11 @@ void Base::printSinglePage()
|
||||
if (m_printer->collateCopies())
|
||||
{
|
||||
doccopies = 1;
|
||||
pagecopies = m_printer->numCopies();
|
||||
pagecopies = m_printer->copyCount();
|
||||
}
|
||||
else
|
||||
{
|
||||
doccopies = m_printer->numCopies();
|
||||
doccopies = m_printer->copyCount();
|
||||
pagecopies = 1;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user