diff options
author | Liang Qi <liang.qi@qt.io> | 2017-10-06 19:26:11 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-10-06 19:27:40 +0200 |
commit | 906ce1c52b1d65428222ffd56b7e3c92fdc47db5 (patch) | |
tree | 0496d78bbda268b7d59fe9d695e42267cd303cb2 /src/plugins | |
parent | 7724e4f378f8d97a3b2a3ad6c01e2db057d638aa (diff) | |
parent | ec16ba393baf504d4b192cc349775c62d3c96aa0 (diff) |
Merge remote-tracking branch 'origin/5.9.2' into 5.9
Change-Id: Iaae1d9efe6b9267e8e8349905811525ff344e00c
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/printsupport/cups/qcupsprintengine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/printsupport/cups/qcupsprintengine.cpp b/src/plugins/printsupport/cups/qcupsprintengine.cpp index e7949d3a0b..6a4eecb06d 100644 --- a/src/plugins/printsupport/cups/qcupsprintengine.cpp +++ b/src/plugins/printsupport/cups/qcupsprintengine.cpp @@ -293,7 +293,7 @@ void QCupsPrintEnginePrivate::changePrinter(const QString &newPrinter) // Try create the printer, only use it if it returns valid QPrintDevice printDevice = ps->createPrintDevice(newPrinter); - if (!m_printDevice.isValid()) + if (!printDevice.isValid()) return; m_printDevice.swap(printDevice); printerName = m_printDevice.id(); |