diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-01-12 15:30:27 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-01-12 20:16:28 +0100 |
| commit | c1e390f16c5c40c2d8115d1c731df67a1cc67384 (patch) | |
| tree | cd49de90bd009fc5d70310fb553177ff95bb237a /src/printsupport/dialogs | |
| parent | 56e42f18180d7d31b4d0b152d2b841ea096e7bb4 (diff) | |
QtPrintSupport: Disambiguate static functions
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>
Diffstat (limited to 'src/printsupport/dialogs')
| -rw-r--r-- | src/printsupport/dialogs/qprintdialog_unix.cpp | 4 | ||||
| -rw-r--r-- | src/printsupport/dialogs/qprintpreviewdialog.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/printsupport/dialogs/qprintdialog_unix.cpp b/src/printsupport/dialogs/qprintdialog_unix.cpp index a73e7dd427..1199c4f600 100644 --- a/src/printsupport/dialogs/qprintdialog_unix.cpp +++ b/src/printsupport/dialogs/qprintdialog_unix.cpp @@ -83,7 +83,7 @@ Print dialog class declarations Layout in qprintpropertieswidget.ui */ -static void initResources() +static void _q_pdu_initResources() { Q_INIT_RESOURCE(qprintdialog); } @@ -584,7 +584,7 @@ QPrintDialogPrivate::QPrintDialogPrivate() : top(nullptr), bottom(nullptr), buttons(nullptr), collapseButton(nullptr), explicitDuplexMode(QPrint::DuplexAuto) { - initResources(); + _q_pdu_initResources(); } QPrintDialogPrivate::~QPrintDialogPrivate() diff --git a/src/printsupport/dialogs/qprintpreviewdialog.cpp b/src/printsupport/dialogs/qprintpreviewdialog.cpp index b58ff76d49..abcc39ac19 100644 --- a/src/printsupport/dialogs/qprintpreviewdialog.cpp +++ b/src/printsupport/dialogs/qprintpreviewdialog.cpp @@ -28,7 +28,7 @@ #include <QtWidgets/qformlayout.h> #include <QtWidgets/qlabel.h> -static void initResources() +static void _q_ppd_initResources() { static bool resourcesInitialized = false; if (!resourcesInitialized) { @@ -192,7 +192,7 @@ void QPrintPreviewDialogPrivate::init(QPrinter *_printer) { Q_Q(QPrintPreviewDialog); - initResources(); + _q_ppd_initResources(); if (_printer) { preview = new QPrintPreviewWidget(_printer, q); |