diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-08-04 22:30:28 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-08-04 22:30:28 (GMT) |
| commit | 40db84c97769141f3f2351de1b2d5c64904fe5c2 (patch) | |
| tree | f674a92a37a130e1ce0bfd7080019fe3b36e9c1b /src/gui/dialogs/qfiledialog.cpp | |
| parent | 897014a47b41dcf2b9d91549be9b96890d5291c7 (diff) | |
| parent | 2843c97f5310f4636c933ced56570ab7db2b707e (diff) | |
| download | Qt-40db84c97769141f3f2351de1b2d5c64904fe5c2.zip Qt-40db84c97769141f3f2351de1b2d5c64904fe5c2.tar.gz Qt-40db84c97769141f3f2351de1b2d5c64904fe5c2.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/gui/dialogs/qfiledialog.cpp')
| -rw-r--r-- | src/gui/dialogs/qfiledialog.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/dialogs/qfiledialog.cpp b/src/gui/dialogs/qfiledialog.cpp index 8b4e1b1..1ec94b6 100644 --- a/src/gui/dialogs/qfiledialog.cpp +++ b/src/gui/dialogs/qfiledialog.cpp @@ -2838,7 +2838,8 @@ void QFileDialogPrivate::_q_goToDirectory(const QString &path) } const char *qt_file_dialog_filter_reg_exp = - "^([^()]*)\\(([a-zA-Z0-9_.*? +;#\\-\\[\\]@\\{\\}/!<>\\$%&=^~:\\|]*)\\)$"; +"(\\W|[a-zA-Z0-9 -]*)\\(([a-zA-Z0-9_.*? +;#\\-\\[\\]@\\{\\}/!<>\\$%&=^~:\\|]*)\\)$"; + // Makes a list of filters from a normal filter string "Image Files (*.png *.jpg)" QStringList qt_clean_filter_list(const QString &filter) |