diff options
| author | Andy Shaw <qt-info@nokia.com> | 2009-07-15 09:44:21 (GMT) |
|---|---|---|
| committer | Andy Shaw <qt-info@nokia.com> | 2009-07-15 09:44:21 (GMT) |
| commit | b9898720b51d24a6f14ecaabc08b4e44d619a7de (patch) | |
| tree | dc0316845af76819f7a5255c698d97ea33232c93 | |
| parent | 4dde6dac24027a4dfede4f79077df3d91de11efa (diff) | |
| parent | 503b5d00dae7e33ff7f6ac55aefc703bb8f92d5c (diff) | |
| download | Qt-b9898720b51d24a6f14ecaabc08b4e44d619a7de.zip Qt-b9898720b51d24a6f14ecaabc08b4e44d619a7de.tar.gz Qt-b9898720b51d24a6f14ecaabc08b4e44d619a7de.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
| -rw-r--r-- | src/gui/dialogs/qfiledialog.cpp | 6 |
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; |