diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-02-17 17:51:49 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-02-17 19:57:54 +0000 |
| commit | 86c5a337e3b123f2e41c8b15b416f39655519acd (patch) | |
| tree | efa0f720a190889b3d31ddbd07cee0495b8a15d4 /src/corelib/io | |
| parent | 47ca3f78139ad51a5018dcdad27fa5caf817f08d (diff) | |
| parent | 6620045fcaada61a2897195f32c0ee35beebc37b (diff) | |
Merge "Merge dev into 5.7" into refs/staging/5.7
Diffstat (limited to 'src/corelib/io')
| -rw-r--r-- | src/corelib/io/qfileselector.cpp | 1 | ||||
| -rw-r--r-- | src/corelib/io/qtextstream.cpp | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/corelib/io/qfileselector.cpp b/src/corelib/io/qfileselector.cpp index 7a9a4b581c..4ac12fc9ea 100644 --- a/src/corelib/io/qfileselector.cpp +++ b/src/corelib/io/qfileselector.cpp @@ -396,6 +396,7 @@ void QFileSelectorPrivate::addStatics(const QStringList &statics) { QMutexLocker locker(&sharedDataMutex); sharedData->preloadedStatics << statics; + sharedData->staticSelectors.clear(); } QT_END_NAMESPACE diff --git a/src/corelib/io/qtextstream.cpp b/src/corelib/io/qtextstream.cpp index 9d3689736c..bc4a5fa538 100644 --- a/src/corelib/io/qtextstream.cpp +++ b/src/corelib/io/qtextstream.cpp @@ -3130,10 +3130,7 @@ void QTextStream::setGenerateByteOrderMark(bool generate) { Q_D(QTextStream); if (d->writeBuffer.isEmpty()) { - if (generate) - d->writeConverterState.flags &= ~QTextCodec::IgnoreHeader; - else - d->writeConverterState.flags |= QTextCodec::IgnoreHeader; + d->writeConverterState.flags.setFlag(QTextCodec::IgnoreHeader, !generate); } } |