diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 10:24:08 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 10:24:08 +0200 |
| commit | d36d2c3026cae67c119384f47cb2680552c81aaf (patch) | |
| tree | 58f464372fa5405ae891fdb0314f8db9f202395e /src/designer/src/lib/sdk/abstractdialoggui.cpp | |
| parent | 2151606a3549e1b951dd20789d9670a460934cc6 (diff) | |
| parent | b83999bfe04d185cbe45a81658bd21bb1b22a532 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1
Change-Id: I49a57527be78cb30692467b2e227aa8afc49dd7d
Diffstat (limited to 'src/designer/src/lib/sdk/abstractdialoggui.cpp')
| -rw-r--r-- | src/designer/src/lib/sdk/abstractdialoggui.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/designer/src/lib/sdk/abstractdialoggui.cpp b/src/designer/src/lib/sdk/abstractdialoggui.cpp index 08a6c0841..0bad7248a 100644 --- a/src/designer/src/lib/sdk/abstractdialoggui.cpp +++ b/src/designer/src/lib/sdk/abstractdialoggui.cpp @@ -140,7 +140,7 @@ QString QDesignerDialogGuiInterface::getOpenImageFileName(QWidget *parent, const QStringList QDesignerDialogGuiInterface::getOpenImageFileNames(QWidget *parent, const QString &caption, const QString &dir, const QString &filter, QString *selectedFilter, QFileDialog::Options options) { - return getOpenImageFileNames(parent, caption, dir, filter, selectedFilter, options); + return getOpenFileNames(parent, caption, dir, filter, selectedFilter, options); } /*! |