diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2023-12-15 20:28:47 -0700 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2023-12-19 21:41:56 -0700 |
| commit | 65deeb3f5125a6091ca959b192d09127ee3a99b0 (patch) | |
| tree | b3fb17fcec6a83a2adfe6103dced969df5f25f1c /src/quick/items/qquicktextdocument.cpp | |
| parent | 8a238c0ab8a8c6ad3851315193c118e859b6da7a (diff) | |
QQuickTextDocument: Read with QIODeviceBase::Text flag
A text, html or markdown file might use any line ending convention.
In QQuickTextDocumentPrivate::writeTo(), we already use the Text flag
when opening the output file for writing.
Amends b46d6a75ac16089de1a29c773e7594a82ffea13e by re-applying the
same fix from 743065d7fe2337aa7229a9ea6d4f9b3c30fa1af0
Pick-to: 6.7
Task-number: QTBUG-118636
Change-Id: I638a2fbd1299bd3bb2cb5c310e40995766dff07b
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/quick/items/qquicktextdocument.cpp')
| -rw-r--r-- | src/quick/items/qquicktextdocument.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/qquicktextdocument.cpp b/src/quick/items/qquicktextdocument.cpp index cde6ad0d10..a4807d806c 100644 --- a/src/quick/items/qquicktextdocument.cpp +++ b/src/quick/items/qquicktextdocument.cpp @@ -143,7 +143,7 @@ void QQuickTextDocumentPrivate::load() if (QFile::exists(fileName)) { mimeType = QMimeDatabase().mimeTypeForFile(fileName); QFile file(fileName); - if (file.open(QFile::ReadOnly)) { + if (file.open(QFile::ReadOnly | QFile::Text)) { QByteArray data = file.readAll(); if (auto *doc = editor->document()) { doc->setBaseUrl(resolvedUrl.adjusted(QUrl::RemoveFilename)); |