1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QtPrintSupport: Disambiguate static functions

Browse Source 
They cause clashes in CMake Unity (Jumbo) builds.

Task-number: QTBUG-109394
Pick-to: 6.5
Change-Id: If3029d5b99499fd0e216fc080ade9842c2d11ea4
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
This commit is contained in:
Friedemann Kleint 2023-01-12 15:30:27 +01:00
parent 56e42f1818
commit c1e390f16c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/printsupport/dialogs/qprintdialog_unix.cpp
View File

@ -83,7 +83,7 @@ Print dialog class declarations
Layout in qprintpropertieswidget.ui Layout in qprintpropertieswidget.ui
*/ */
static void initResources() static void _q_pdu_initResources()
{ {
Q_INIT_RESOURCE(qprintdialog); Q_INIT_RESOURCE(qprintdialog);
} }
@ -584,7 +584,7 @@ QPrintDialogPrivate::QPrintDialogPrivate()
: top(nullptr), bottom(nullptr), buttons(nullptr), collapseButton(nullptr), : top(nullptr), bottom(nullptr), buttons(nullptr), collapseButton(nullptr),
explicitDuplexMode(QPrint::DuplexAuto) explicitDuplexMode(QPrint::DuplexAuto)
{ {
initResources(); _q_pdu_initResources();
} }
QPrintDialogPrivate::~QPrintDialogPrivate() QPrintDialogPrivate::~QPrintDialogPrivate()

4
src/printsupport/dialogs/qprintpreviewdialog.cpp
View File

@ -28,7 +28,7 @@
#include <QtWidgets/qformlayout.h> #include <QtWidgets/qformlayout.h>
#include <QtWidgets/qlabel.h> #include <QtWidgets/qlabel.h>
static void initResources() static void _q_ppd_initResources()
{ {
static bool resourcesInitialized = false; static bool resourcesInitialized = false;
if (!resourcesInitialized) { if (!resourcesInitialized) {
@ -192,7 +192,7 @@ void QPrintPreviewDialogPrivate::init(QPrinter *_printer)
{ {
Q_Q(QPrintPreviewDialog); Q_Q(QPrintPreviewDialog);
initResources(); _q_ppd_initResources();
if (_printer) { if (_printer) {
preview = new QPrintPreviewWidget(_printer, q); preview = new QPrintPreviewWidget(_printer, q);