diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-07-28 10:58:46 (GMT) |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-07-28 11:45:59 (GMT) |
| commit | 7eba68adc4a7862d9474179592e5c8393a7acdbb (patch) | |
| tree | 73014cabc8b10f46203844aeb40de574d97032dc /src/gui/painting/qprinter.cpp | |
| parent | a20f8dcbeafa34b50ef69d1c5db0f17b09731d2a (diff) | |
| parent | 3bf3981c7026de9017887d08312391b54fe8afc6 (diff) | |
| download | Qt-7eba68adc4a7862d9474179592e5c8393a7acdbb.zip Qt-7eba68adc4a7862d9474179592e5c8393a7acdbb.tar.gz Qt-7eba68adc4a7862d9474179592e5c8393a7acdbb.tar.bz2 | |
Merge commit 'qt/master-stable'
Conflicts:
configure.exe
src/corelib/io/io.pri
src/corelib/io/qfilesystemwatcher.cpp
tests/auto/qfileinfo/tst_qfileinfo.cpp
tools/configure/configureapp.cpp
Diffstat (limited to 'src/gui/painting/qprinter.cpp')
| -rw-r--r-- | src/gui/painting/qprinter.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/painting/qprinter.cpp b/src/gui/painting/qprinter.cpp index efaeb43..bc54b5c 100644 --- a/src/gui/painting/qprinter.cpp +++ b/src/gui/painting/qprinter.cpp @@ -2161,8 +2161,8 @@ bool QPrinter::collateCopiesEnabled() const } /*! - Use QPrintDialog::addEnabledOption(QPrintDialog::PrintCollateCopies) - or QPrintDialog::setEnabledOptions(QPrintDialog::enabledOptions() + Use QPrintDialog::setOption(QPrintDialog::PrintCollateCopies) + or QPrintDialog::setOptions(QPrintDialog::options() & ~QPrintDialog::PrintCollateCopies) instead, depending on \a enable. */ |