diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-31 09:04:18 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-31 09:04:18 +0200 |
| commit | 9f085b889524a80d4064d6ac01dbdc817bb31060 (patch) | |
| tree | a65a8871f44a0572e1459dd14759b2339f93de5e /src/dialogs/qquickabstractfiledialog.cpp | |
| parent | 9a56985c91d16d7c42ba86f4b0a70f85973e0618 (diff) | |
| parent | 8c37d58fa21fd3cf6897e2d7d4fe1f73c983d2f4 (diff) | |
| download | qtquickcontrols-9f085b889524a80d4064d6ac01dbdc817bb31060.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: Ia574913a1c2af6349db33966c172e96f6eb5f127
Diffstat (limited to 'src/dialogs/qquickabstractfiledialog.cpp')
| -rw-r--r-- | src/dialogs/qquickabstractfiledialog.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/dialogs/qquickabstractfiledialog.cpp b/src/dialogs/qquickabstractfiledialog.cpp index c0b3400c..49d98a1a 100644 --- a/src/dialogs/qquickabstractfiledialog.cpp +++ b/src/dialogs/qquickabstractfiledialog.cpp @@ -186,6 +186,7 @@ QStringList QQuickAbstractFileDialog::selectedNameFilterExtensions() const { QString filterRaw = selectedNameFilter(); QStringList ret; +#if QT_CONFIG(regularexpression) if (filterRaw.isEmpty()) { ret << "*"; return ret; @@ -194,6 +195,7 @@ QStringList QQuickAbstractFileDialog::selectedNameFilterExtensions() const QRegularExpressionMatchIterator i = re.globalMatch(filterRaw); while (i.hasNext()) ret << i.next().captured(1); +#endif // QT_CONFIG(regularexpression) if (ret.isEmpty()) ret << filterRaw; return ret; |