diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-30 13:13:35 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-30 13:13:35 (GMT) |
| commit | e084de5fd15b6f8afadefbf6926e5632c0677cf0 (patch) | |
| tree | 42f50373eceff8c74a500267109b9ca489822252 /src | |
| parent | 91119eaa185934d568d0c83e25129b0028b5a607 (diff) | |
| parent | 07e74a963dbd2bf597dbea231d7b2cefba05fde2 (diff) | |
| download | Qt-e084de5fd15b6f8afadefbf6926e5632c0677cf0.zip Qt-e084de5fd15b6f8afadefbf6926e5632c0677cf0.tar.gz Qt-e084de5fd15b6f8afadefbf6926e5632c0677cf0.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fixed the incorrect diagram for bug QTBUG-12385.
QFileDialog crashes when empty selectedFilter is set on Carbon.
Fix crash on Desktop platforms.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/dialogs/qfiledialog_mac.mm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/gui/dialogs/qfiledialog_mac.mm b/src/gui/dialogs/qfiledialog_mac.mm index f1afaa9..64fc0ee 100644 --- a/src/gui/dialogs/qfiledialog_mac.mm +++ b/src/gui/dialogs/qfiledialog_mac.mm @@ -782,9 +782,11 @@ void QFileDialogPrivate::qt_mac_filedialog_event_proc(const NavEventCallbackMess const QtMacFilterName &fn = fileDialogPrivate->filterInfo.filters.at( fileDialogPrivate->filterInfo.currentSelection); QStringList reg = fn.regexp.split(QLatin1String(";"), QString::SkipEmptyParts); - QString r = reg.first(); - r = r.right(r.length()-1); // Strip the * - base += r; //"." + QString::number(s->menuType); + if (reg.count()) { + QString r = reg.first(); + r = r.right(r.length()-1); // Strip the * + base += r; //"." + QString::number(s->menuType); + } NavDialogSetSaveFileName(p->context, QCFString::toCFStringRef(base)); } #ifdef DEBUG_FILEDIALOG_FILTERS |