summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlexis Menard <alexis.menard@nokia.com>2009-07-15 09:24:10 (GMT)
committerAlexis Menard <alexis.menard@nokia.com>2009-07-15 09:26:23 (GMT)
commit503b5d00dae7e33ff7f6ac55aefc703bb8f92d5c (patch)
treec1ccc988c2b5394099bd6c2f38c70fe9bbfc7dea /src
parent6b9328056591af2c48bed67f372693f030ba8c20 (diff)
downloadQt-503b5d00dae7e33ff7f6ac55aefc703bb8f92d5c.zip
Qt-503b5d00dae7e33ff7f6ac55aefc703bb8f92d5c.tar.gz
Qt-503b5d00dae7e33ff7f6ac55aefc703bb8f92d5c.tar.bz2
QFileDialog static functions doesn't honor the DontUseNativeDialog flag.
Just add a check before calling hooks. Task-number:258084 Reviewed-by:jbache
Diffstat (limited to 'src')
-rw-r--r--src/gui/dialogs/qfiledialog.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/dialogs/qfiledialog.cpp b/src/gui/dialogs/qfiledialog.cpp
index d18cc7f..c8ce162 100644
--- a/src/gui/dialogs/qfiledialog.cpp
+++ b/src/gui/dialogs/qfiledialog.cpp
@@ -1677,7 +1677,7 @@ QStringList QFileDialog::getOpenFileNames(QWidget *parent,
QString *selectedFilter,
Options options)
{
- if (qt_filedialog_open_filenames_hook)
+ if (qt_filedialog_open_filenames_hook && !(options & DontUseNativeDialog))
return qt_filedialog_open_filenames_hook(parent, caption, dir, filter, selectedFilter, options);
QFileDialogArgs args;
args.parent = parent;
@@ -1763,7 +1763,7 @@ QString QFileDialog::getSaveFileName(QWidget *parent,
QString *selectedFilter,
Options options)
{
- if (qt_filedialog_save_filename_hook)
+ if (qt_filedialog_save_filename_hook && !(options & DontUseNativeDialog))
return qt_filedialog_save_filename_hook(parent, caption, dir, filter, selectedFilter, options);
QFileDialogArgs args;
args.parent = parent;
@@ -1838,7 +1838,7 @@ QString QFileDialog::getExistingDirectory(QWidget *parent,
const QString &dir,
Options options)
{
- if (qt_filedialog_existing_directory_hook)
+ if (qt_filedialog_existing_directory_hook && !(options & DontUseNativeDialog))
return qt_filedialog_existing_directory_hook(parent, caption, dir, options);
QFileDialogArgs args;
args.parent = parent;