diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-08-21 02:32:49 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-08-21 02:32:50 +0200 |
| commit | 5a03b75c50b2e34552c7ec3e1e15e7b2a0128bf7 (patch) | |
| tree | 88e05cd6150e0b3cda4e8716668082c655007fb8 /src/widgets/dialogs/qfilesystemmodel_p.h | |
| parent | 0e7724079f1eae283714ae12769d1372b8f85659 (diff) | |
| parent | 6553921dd537e416da2f4d1441ab6d63059cda60 (diff) | |
Merge dev into 5.12
Change-Id: I63f632b595f66d2fc93e9aa713500e3799e3df2a
Diffstat (limited to 'src/widgets/dialogs/qfilesystemmodel_p.h')
| -rw-r--r-- | src/widgets/dialogs/qfilesystemmodel_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/dialogs/qfilesystemmodel_p.h b/src/widgets/dialogs/qfilesystemmodel_p.h index 1e72bb69a8..9c432e1ae6 100644 --- a/src/widgets/dialogs/qfilesystemmodel_p.h +++ b/src/widgets/dialogs/qfilesystemmodel_p.h @@ -315,8 +315,8 @@ public: //It enable a sort which is not recursive, it means //we sort only what we see. bool disableRecursiveSort; -#ifndef QT_NO_REGEXP - QList<QRegExp> nameFilters; +#if QT_CONFIG(regularexpression) + QStringList nameFilters; #endif QHash<QString, QString> resolvedSymLinks; |