1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QWidgetTextControl: Fix build with -no-feature-textodfwrite

Browse Source 
.../qtbase/src/widgets/widgets/qwidgettextcontrol.cpp(3470): error C2059: syntax error: ')'

.../qtbase/src/widgets/widgets/qwidgettextcontrol.cpp(3478): error C3536: 'supportedMimeTypes': cannot be used before it is initialized

Drive-by change: apply the same fix for 'textmarkdownwriter' feature.

This amends commit 6cd8f1fbefba929427d694060fae7e4b26a73dee.

Change-Id: I78fd66c4d16003aa7e98b0f6b3dfcd1f9c5cb1e5
Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
This commit is contained in:
Nodir Temirkhodjaev 2024-09-06 11:42:32 +05:00 committed by Ahmad Samir
parent 1b592e18b2
commit e16c4069fd
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/widgets/widgets/qwidgettextcontrol.cpp
View File

@ -3460,12 +3460,12 @@ void QUnicodeControlCharacterMenu::menuActionTriggered()
static constexpr auto supportedMimeTypes = qOffsetStringArray( static constexpr auto supportedMimeTypes = qOffsetStringArray(
"text/plain", "text/plain",
"text/html", "text/html"
#if QT_CONFIG(textmarkdownwriter) #if QT_CONFIG(textmarkdownwriter)
"text/markdown", , "text/markdown"
#endif #endif
#if QT_CONFIG(textodfwriter) #if QT_CONFIG(textodfwriter)
"application/vnd.oasis.opendocument.text" , "application/vnd.oasis.opendocument.text"
#endif #endif
); );