diff options
Diffstat (limited to 'src/printsupport/kernel/qprinter.cpp')
-rw-r--r-- | src/printsupport/kernel/qprinter.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/printsupport/kernel/qprinter.cpp b/src/printsupport/kernel/qprinter.cpp index 2cecf61573..7f08bdb3e9 100644 --- a/src/printsupport/kernel/qprinter.cpp +++ b/src/printsupport/kernel/qprinter.cpp @@ -160,7 +160,8 @@ void QPrinterPrivate::changeEngines(QPrinter::OutputFormat format, const QPrinte initEngines(format, printer); if (oldPrintEngine) { - foreach (QPrintEngine::PrintEnginePropertyKey key, m_properties) { + const auto properties = m_properties; // take a copy: setProperty() below modifies m_properties + for (const auto &key : properties) { QVariant prop; // PPK_NumberOfCopies need special treatmeant since it in most cases // will return 1, disregarding the actual value that was set @@ -695,7 +696,7 @@ QPrinter::QPrinter(const QPrinterInfo& printer, PrinterMode mode) void QPrinterPrivate::init(const QPrinterInfo &printer, QPrinter::PrinterMode mode) { - if (!QCoreApplication::instance()) { + if (Q_UNLIKELY(!QCoreApplication::instance())) { qFatal("QPrinter: Must construct a QCoreApplication before a QPrinter"); return; } |