partial build fix for the case when QT_NO_TEXTHTMLPARSER is defined

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/src/core/global/qconfig.h.cmake b/src/core/global/qconfig.h.cmake
index 855abec..b2659d7 100644 (file)
--- a/src/core/global/qconfig.h.cmake
+++ b/src/core/global/qconfig.h.cmake
@@ -146,6 +146,9 @@
 // #cmakedefine QT_NO_TABLEVIEW
 // #cmakedefine QT_NO_TABLEWIDGET
 // #cmakedefine QT_NO_TEMPORARYFILE
+// #cmakedefine QT_NO_TEXTCONTROL
+// #cmakedefine QT_NO_TEXTEDIT
+// #cmakedefine QT_NO_TEXTHTMLPARSER
 
 // Misc
 #cmakedefine QT_NO_USING_NAMESPACE
@@ -198,10 +201,7 @@
 #cmakedefine QT_NO_SYSTEMSEMAPHORE
 #cmakedefine QT_NO_SYSTEMTRAYICON
 #cmakedefine QT_NO_TEXTBROWSER
-#cmakedefine QT_NO_TEXTCONTROL
 #cmakedefine QT_NO_TEXTDATE
-#cmakedefine QT_NO_TEXTEDIT
-#cmakedefine QT_NO_TEXTHTMLPARSER
 #cmakedefine QT_NO_TOOLBAR
 #cmakedefine QT_NO_TOOLBOX
 #cmakedefine QT_NO_TOOLBUTTON

diff --git a/src/gui/text/qtextdocumentfragment.cpp b/src/gui/text/qtextdocumentfragment.cpp
index 8340ff8..3d90abf 100644 (file)
--- a/src/gui/text/qtextdocumentfragment.cpp
+++ b/src/gui/text/qtextdocumentfragment.cpp
@@ -1145,8 +1145,6 @@ void QTextHtmlImporter::appendBlock(const QTextBlockFormat &format, QTextCharFor
         compressNextWhitespace = RemoveWhiteSpace;
 }
 
-#endif // QT_NO_TEXTHTMLPARSER
-
 /*!
     \fn QTextDocumentFragment QTextDocumentFragment::fromHtml(const QString &text)
 
@@ -1156,8 +1154,6 @@ void QTextHtmlImporter::appendBlock(const QTextBlockFormat &format, QTextCharFor
     fragment with the text "bold" with a bold character format.
 */
 
-#ifndef QT_NO_TEXTHTMLPARSER
-
 QTextDocumentFragment QTextDocumentFragment::fromHtml(const QString &html)
 {
     return fromHtml(html, 0);
@@ -1186,11 +1182,7 @@ QTextDocumentFragment QTextDocumentFragment::fromHtml(const QString &html, const
     return res;
 }
 
-QT_END_NAMESPACE
 #endif // QT_NO_TEXTHTMLPARSER
 
-
-
-
-
+QT_END_NAMESPACE
 

diff --git a/src/gui/text/qtextdocumentfragment_p.h b/src/gui/text/qtextdocumentfragment_p.h
index a0ec198..1d873c0 100644 (file)
--- a/src/gui/text/qtextdocumentfragment_p.h
+++ b/src/gui/text/qtextdocumentfragment_p.h
@@ -206,7 +206,8 @@ private:
     const QTextHtmlParserNode *currentNode;
 };
 
-QT_END_NAMESPACE
 #endif // QT_NO_TEXTHTMLPARSER
 
+QT_END_NAMESPACE
+
 #endif // QTEXTDOCUMENTFRAGMENT_P_H