diff options
author | Jari Helaakoski <[email protected]> | 2024-04-24 14:40:49 +0300 |
---|---|---|
committer | Jari Helaakoski <[email protected]> | 2024-04-30 09:00:03 +0000 |
commit | 4949768067cfc8a16c0cef958928e94147842bb8 (patch) | |
tree | d4138c6bc0ebbc9f5158fe667759287eee016967 /src/quick/items/qquicktextdocument.cpp | |
parent | 86cb97000b2acf1185634f9f9bdaa023e685b969 (diff) |
Fix test compilation issues with QtLite configuration
Now developer build tests compile, but some are not working.
Functional fix will come later via separate tasks.
Task-number: QTBUG-122999
Change-Id: I0a0dfcf7affb73f928b8be62b3576a6a51658488
Reviewed-by: Ulf Hermann <[email protected]>
Diffstat (limited to 'src/quick/items/qquicktextdocument.cpp')
-rw-r--r-- | src/quick/items/qquicktextdocument.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/quick/items/qquicktextdocument.cpp b/src/quick/items/qquicktextdocument.cpp index 6443b9ef70..7812cf107e 100644 --- a/src/quick/items/qquicktextdocument.cpp +++ b/src/quick/items/qquicktextdocument.cpp @@ -326,13 +326,15 @@ void QQuickTextDocumentPrivate::load() setStatus(QQuickTextDocument::Status::Loading, {}); QByteArray data = file.readAll(); doc->setBaseUrl(resolvedUrl.adjusted(QUrl::RemoveFilename)); +#if QT_CONFIG(textmarkdownreader) || QT_CONFIG(texthtmlparser) const bool plainText = editor->textFormat() == QQuickTextEdit::PlainText; +#endif #if QT_CONFIG(textmarkdownreader) if (!plainText && isMarkdown) { doc->setMarkdown(QString::fromUtf8(data)); } else #endif -#ifndef QT_NO_TEXTHTMLPARSER +#if QT_CONFIG(texthtmlparser) if (!plainText && isHtml) { // If a user loads an HTML file, remember the encoding. // If the user then calls save() later, the same encoding will be used. @@ -411,7 +413,7 @@ void QQuickTextDocumentPrivate::writeTo(const QUrl &fileUrl) raw = doc->toMarkdown().toUtf8(); break; #endif -#ifndef QT_NO_TEXTHTMLPARSER +#if QT_CONFIG(texthtmlparser) case Qt::RichText: if (sameUrl && encoding) { QStringEncoder enc(*encoding); |