diff options
author | Liang Qi <liang.qi@qt.io> | 2018-10-08 10:56:25 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-10-08 10:56:25 +0200 |
commit | 7344987c20d13710af89300f9b39e06397ec592a (patch) | |
tree | 4c12e46adefd3aee9d2ce479923fe56bab483764 /src/widgets/dialogs/qfiledialog.cpp | |
parent | 8ad5967793f43bda2c38e3f9dddd3d2b6fef5390 (diff) | |
parent | 29208fa07c1b9f656ea2535696828385b7832226 (diff) |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
src/widgets/styles/qstylesheetstyle.cpp
Change-Id: I3a503b44ae413fbc0a90f4af70b8f84daffd86ad
Diffstat (limited to 'src/widgets/dialogs/qfiledialog.cpp')
-rw-r--r-- | src/widgets/dialogs/qfiledialog.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/widgets/dialogs/qfiledialog.cpp b/src/widgets/dialogs/qfiledialog.cpp index 6b037726a0..870a833b34 100644 --- a/src/widgets/dialogs/qfiledialog.cpp +++ b/src/widgets/dialogs/qfiledialog.cpp @@ -802,8 +802,6 @@ QFileDialog::Options QFileDialog::options() const } /*! - \overload - \since 4.5 This function connects one of its signals to the slot specified by \a receiver |