diff options
author | Lars Knoll <lars.knoll@qt.io> | 2017-12-30 17:39:21 +0100 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2018-01-02 09:58:44 +0100 |
commit | 0f315adf9199efcfafa44371464ab6d1fc866774 (patch) | |
tree | 35b67591255624c670aff0579e45b2973f56fd81 /src/printsupport/kernel | |
parent | 2b0eb3fac319a17dd92903106d501f0f06df871f (diff) | |
parent | 52b85212a2ec8ec5bf187f6cd00b669a45bcf0bd (diff) |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
.qmake.conf
sc/corelib/io/qfsfileengine_p.h
src/corelib/io/qstorageinfo_unix.cpp
src/platformsupport/eglconvenience/qeglpbuffer_p.h
src/platformsupport/input/libinput/qlibinputkeyboard.cpp
src/platformsupport/input/libinput/qlibinputpointer.cpp
src/plugins/platforms/cocoa/qcocoamenu.mm
src/plugins/platforms/ios/qiosscreen.h
src/plugins/platforms/ios/qioswindow.h
src/plugins/platforms/ios/quiview.mm
src/printsupport/dialogs/qpagesetupdialog_unix_p.h
src/printsupport/dialogs/qprintpreviewdialog.cpp
src/printsupport/widgets/qcupsjobwidget_p.h
src/widgets/widgets/qmenu.cpp
tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
Change-Id: Iecb4883122efe97ef0ed850271e6c51bab568e9c
Diffstat (limited to 'src/printsupport/kernel')
-rw-r--r-- | src/printsupport/kernel/qpaintengine_preview.cpp | 8 | ||||
-rw-r--r-- | src/printsupport/kernel/qplatformprintersupport.cpp | 4 | ||||
-rw-r--r-- | src/printsupport/kernel/qplatformprintplugin.cpp | 4 | ||||
-rw-r--r-- | src/printsupport/kernel/qprintengine_pdf.cpp | 2 | ||||
-rw-r--r-- | src/printsupport/kernel/qprintengine_win.cpp | 2 | ||||
-rw-r--r-- | src/printsupport/kernel/qprinter.cpp | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/src/printsupport/kernel/qpaintengine_preview.cpp b/src/printsupport/kernel/qpaintengine_preview.cpp index 4c00333097..7179249677 100644 --- a/src/printsupport/kernel/qpaintengine_preview.cpp +++ b/src/printsupport/kernel/qpaintengine_preview.cpp @@ -69,8 +69,8 @@ QPreviewPaintEngine::QPreviewPaintEngine() : QPaintEngine(*(new QPreviewPaintEnginePrivate), PaintEngineFeatures(AllFeatures & ~ObjectBoundingModeGradients)) { Q_D(QPreviewPaintEngine); - d->proxy_print_engine = 0; - d->proxy_paint_engine = 0; + d->proxy_print_engine = nullptr; + d->proxy_paint_engine = nullptr; } QPreviewPaintEngine::~QPreviewPaintEngine() @@ -102,8 +102,8 @@ bool QPreviewPaintEngine::end() Q_D(QPreviewPaintEngine); delete d->painter; - d->painter = 0; - d->engine = 0; + d->painter = nullptr; + d->engine = nullptr; d->state = QPrinter::Idle; return true; } diff --git a/src/printsupport/kernel/qplatformprintersupport.cpp b/src/printsupport/kernel/qplatformprintersupport.cpp index 388dd5ff8e..e12a292aec 100644 --- a/src/printsupport/kernel/qplatformprintersupport.cpp +++ b/src/printsupport/kernel/qplatformprintersupport.cpp @@ -70,12 +70,12 @@ QPlatformPrinterSupport::~QPlatformPrinterSupport() QPrintEngine *QPlatformPrinterSupport::createNativePrintEngine(QPrinter::PrinterMode, const QString &) { - return 0; + return nullptr; } QPaintEngine *QPlatformPrinterSupport::createPaintEngine(QPrintEngine *, QPrinter::PrinterMode) { - return 0; + return nullptr; } QPrintDevice QPlatformPrinterSupport::createPrintDevice(QPlatformPrintDevice *device) diff --git a/src/printsupport/kernel/qplatformprintplugin.cpp b/src/printsupport/kernel/qplatformprintplugin.cpp index a80f369040..9a7656f7d6 100644 --- a/src/printsupport/kernel/qplatformprintplugin.cpp +++ b/src/printsupport/kernel/qplatformprintplugin.cpp @@ -60,12 +60,12 @@ QPlatformPrinterSupportPlugin::~QPlatformPrinterSupportPlugin() { } -static QPlatformPrinterSupport *printerSupport = 0; +static QPlatformPrinterSupport *printerSupport = nullptr; static void cleanupPrinterSupport() { delete printerSupport; - printerSupport = 0; + printerSupport = nullptr; } /*! diff --git a/src/printsupport/kernel/qprintengine_pdf.cpp b/src/printsupport/kernel/qprintengine_pdf.cpp index 080ff7ccf4..873e146eec 100644 --- a/src/printsupport/kernel/qprintengine_pdf.cpp +++ b/src/printsupport/kernel/qprintengine_pdf.cpp @@ -381,7 +381,7 @@ void QPdfPrintEnginePrivate::closePrintDevice() #endif fd = -1; delete outDevice; - outDevice = 0; + outDevice = nullptr; } } diff --git a/src/printsupport/kernel/qprintengine_win.cpp b/src/printsupport/kernel/qprintengine_win.cpp index ba234b3aae..a943d24cb1 100644 --- a/src/printsupport/kernel/qprintengine_win.cpp +++ b/src/printsupport/kernel/qprintengine_win.cpp @@ -1499,7 +1499,7 @@ QVariant QWin32PrintEngine::property(PrintEnginePropertyKey key) const QList<QVariant> out; const auto inputSlots = d->m_printDevice.supportedInputSlots(); out.reserve(inputSlots.size()); - for (const QPrint::InputSlot inputSlot : inputSlots) + for (const QPrint::InputSlot &inputSlot : inputSlots) out << QVariant(inputSlot.id == QPrint::CustomInputSlot ? inputSlot.windowsId : int(inputSlot.id)); value = out; break; diff --git a/src/printsupport/kernel/qprinter.cpp b/src/printsupport/kernel/qprinter.cpp index dd0fa8639b..8a2cdcb34f 100644 --- a/src/printsupport/kernel/qprinter.cpp +++ b/src/printsupport/kernel/qprinter.cpp @@ -132,7 +132,7 @@ void QPrinterPrivate::initEngines(QPrinter::OutputFormat format, const QPrinterI { // Default to PdfFormat outputFormat = QPrinter::PdfFormat; - QPlatformPrinterSupport *ps = 0; + QPlatformPrinterSupport *ps = nullptr; QString printerName; // Only set NativeFormat if we have a valid plugin and printer to use |