diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-11 08:00:07 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-11 08:00:07 (GMT) |
| commit | 34fa1d2ccd25c50d31b27258b45d585799c7e93a (patch) | |
| tree | 7bf66316eb1d32a42ae4c1de345853c9afef823a | |
| parent | de35f4df32f1348af48eb965b78a66dc86ad72fd (diff) | |
| parent | 4d36724867d77f3c8bf31b084ef8beae3a9646b3 (diff) | |
| download | Qt-34fa1d2ccd25c50d31b27258b45d585799c7e93a.zip Qt-34fa1d2ccd25c50d31b27258b45d585799c7e93a.tar.gz Qt-34fa1d2ccd25c50d31b27258b45d585799c7e93a.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed a potential crash with misconfigured CUPS printers.
| -rw-r--r-- | src/gui/dialogs/qprintdialog_unix.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/dialogs/qprintdialog_unix.cpp b/src/gui/dialogs/qprintdialog_unix.cpp index 00dc3e6..9135350 100644 --- a/src/gui/dialogs/qprintdialog_unix.cpp +++ b/src/gui/dialogs/qprintdialog_unix.cpp @@ -968,7 +968,7 @@ void QUnixPrintWidgetPrivate::_q_btnPropertiesClicked() #if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY) void QUnixPrintWidgetPrivate::setCupsProperties() { - if (cups && QCUPSSupport::isAvailable()) { + if (cups && QCUPSSupport::isAvailable() && cups->pageSizes()) { QPrintEngine *engine = printer->printEngine(); const ppd_option_t* pageSizes = cups->pageSizes(); QByteArray cupsPageSize; |