summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Cattell <matthew.cattell@nokia.com>2009-08-04 14:45:46 (GMT)
committerMatthew Cattell <matthew.cattell@nokia.com>2009-08-04 14:59:36 (GMT)
commit31edb4d5a63b9b3c28cce1c4ca6eb99f62a09759 (patch)
treebab79e6712b0d65127ef68871ed4fd470f636a82
parent6e9d84fcadc07b8f11d9e0eb046c25152eba1235 (diff)
downloadQt-31edb4d5a63b9b3c28cce1c4ca6eb99f62a09759.zip
Qt-31edb4d5a63b9b3c28cce1c4ca6eb99f62a09759.tar.gz
Qt-31edb4d5a63b9b3c28cce1c4ca6eb99f62a09759.tar.bz2
qregext filter changed to support additional parameter/unicode
changed the QRegExp filter back to the old form plus an additional piece to allow international characters. the new regular expression now allows a file type filter to contain a bracketed description prior to the filter set itself. 259105 Andy Shaw
-rw-r--r--src/gui/dialogs/qfiledialog.cpp3
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)