Merge "Merge dev into 5.7" into refs/staging/5.7

1 files changed, 4 insertions, 9 deletions

diff --git a/src/widgets/dialogs/qfiledialog.cpp b/src/widgets/dialogs/qfiledialog.cpp
index ca2b0c0889..07422f8811 100644
--- a/src/widgets/dialogs/qfiledialog.cpp
+++ b/src/widgets/dialogs/qfiledialog.cpp
@@ -787,10 +787,8 @@ void QFileDialog::setOptions(Options options)
 
         if (changed & DontUseCustomDirectoryIcons) {
             QFileIconProvider::Options providerOptions = iconProvider()->options();
-            if (options & DontUseCustomDirectoryIcons)
-                providerOptions |= QFileIconProvider::DontUseCustomDirectoryIcons;
-            else
-                providerOptions &= ~QFileIconProvider::DontUseCustomDirectoryIcons;
+            providerOptions.setFlag(QFileIconProvider::DontUseCustomDirectoryIcons,
+                                    options & DontUseCustomDirectoryIcons);
             iconProvider()->setOptions(providerOptions);
         }
     }
@@ -3455,7 +3453,7 @@ void QFileDialogPrivate::_q_autoCompleteFileName(const QString &text)
     const QStringList multipleFiles = typedFiles();
     if (multipleFiles.count() > 0) {
         QModelIndexList oldFiles = qFileDialogUi->listView->selectionModel()->selectedRows();
-        QModelIndexList newFiles;
+        QVector<QModelIndex> newFiles;
         for (const auto &file : multipleFiles) {
             QModelIndex idx = model->index(file);
             if (oldFiles.removeAll(idx) == 0)
@@ -3718,10 +3716,7 @@ void QFileDialogPrivate::_q_showHidden()
 {
     Q_Q(QFileDialog);
     QDir::Filters dirFilters = q->filter();
-    if (showHiddenAction->isChecked())
-        dirFilters |= QDir::Hidden;
-    else
-        dirFilters &= ~QDir::Hidden;
+    dirFilters.setFlag(QDir::Hidden, showHiddenAction->isChecked());
     q->setFilter(dirFilters);
 }