diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-09-06 13:26:31 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-09-06 13:26:31 +0200 |
| commit | 19dd2ca93b8b95a5e2792b29ed62ea23800fb53e (patch) | |
| tree | 17685d2a9628ec5936155e09da3edd74c9244b0e /src/widgets/dialogs/qfiledialog.cpp | |
| parent | 942922652481347659a0dae78758c334778a58d2 (diff) | |
| parent | d332a2d3ccb485c9decd6c47fa5a5fc02b59d27e (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
examples/opengl/qopenglwidget/main.cpp
src/3rdparty/pcre2/src/pcre2_printint.c
src/plugins/platforms/cocoa/qnsview.mm
src/widgets/widgets/qcombobox.cpp
Change-Id: I37ced9da1e8056f95851568bcc52cd5dc34f56af
Diffstat (limited to 'src/widgets/dialogs/qfiledialog.cpp')
| -rw-r--r-- | src/widgets/dialogs/qfiledialog.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/dialogs/qfiledialog.cpp b/src/widgets/dialogs/qfiledialog.cpp index 97afce1734..8d0161d96b 100644 --- a/src/widgets/dialogs/qfiledialog.cpp +++ b/src/widgets/dialogs/qfiledialog.cpp @@ -4130,7 +4130,7 @@ QStringList QFSCompleter::splitPath(const QString &path) const return parts; } -#endif // QT_NO_COMPLETER +#endif // QT_CONFIG(completer) QT_END_NAMESPACE |