diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-10-09 17:56:51 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-10-09 17:56:52 +0200 |
| commit | 881ceeff428c377d02ae3881beccdbb028385075 (patch) | |
| tree | 65bd4335d7f67b81b04e33f2cbb17a41cf966dd8 /src/corelib/io/qfileselector.cpp | |
| parent | b3d2c867ed14cd6337d5e32b8750f198b5b7d331 (diff) | |
| parent | 106487387d493dab934e19b33bfed55b8df62d67 (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: I05fcd8dc66d9ad0dc76bb7f5bae05c9876bfba14
Diffstat (limited to 'src/corelib/io/qfileselector.cpp')
| -rw-r--r-- | src/corelib/io/qfileselector.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/io/qfileselector.cpp b/src/corelib/io/qfileselector.cpp index c3c504c1aa..95fa970b2d 100644 --- a/src/corelib/io/qfileselector.cpp +++ b/src/corelib/io/qfileselector.cpp @@ -140,7 +140,7 @@ QFileSelectorPrivate::QFileSelectorPrivate() deployment step as an optimization. As selectors come with a performance cost, it is recommended to avoid their use in circumstances involving performance-critical code. - \section1 Adding selectors + \section1 Adding Selectors Selectors normally available are \list @@ -158,7 +158,7 @@ QFileSelectorPrivate::QFileSelectorPrivate() future calls to select(). If the extra selectors list has been changed, calls to select() will use the new list and may return differently. - \section1 Conflict resolution when multiple selectors apply + \section1 Conflict Resolution when Multiple Selectors Apply When multiple selectors could be applied to the same file, the first matching selector is chosen. The order selectors are checked in are: |