diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-19 07:55:57 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-19 07:55:57 (GMT) |
| commit | 84f0ae22f4b1e7882f4c0fff2a1f5bc47ebceb37 (patch) | |
| tree | 0a3416b8f4281939de96f799ea06e91e56fe05cf /src/gui/painting | |
| parent | 1f12c4824942949f3c030f7b2afd44cfac215417 (diff) | |
| parent | 3d86aa8f7188bee865bd286fa7dffd80a5c78215 (diff) | |
| download | Qt-84f0ae22f4b1e7882f4c0fff2a1f5bc47ebceb37.zip Qt-84f0ae22f4b1e7882f4c0fff2a1f5bc47ebceb37.tar.gz Qt-84f0ae22f4b1e7882f4c0fff2a1f5bc47ebceb37.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:
QMenu: Behavior regression
Mac: Graphics View starving user events and sometimes crashes.
Fixed a crash on Windows 7 systems with invalid PrinterPorts entries.
Diffstat (limited to 'src/gui/painting')
| -rw-r--r-- | src/gui/painting/qprintengine_win.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gui/painting/qprintengine_win.cpp b/src/gui/painting/qprintengine_win.cpp index 374bfa0..76dad72 100644 --- a/src/gui/painting/qprintengine_win.cpp +++ b/src/gui/painting/qprintengine_win.cpp @@ -964,12 +964,13 @@ void QWin32PrintEnginePrivate::queryDefault() return; QStringList info = output.split(QLatin1Char(',')); - if (info.size() > 0) { + int infoSize = info.size(); + if (infoSize > 0) { if (name.isEmpty()) name = info.at(0); - if (program.isEmpty()) + if (program.isEmpty() && infoSize > 1) program = info.at(1); - if (port.isEmpty()) + if (port.isEmpty() && infoSize > 2) port = info.at(2); } } |