diff options
| author | Lars Knoll <[email protected]> | 2020-10-06 16:00:14 +0200 |
|---|---|---|
| committer | Lars Knoll <[email protected]> | 2020-10-12 14:49:50 +0200 |
| commit | 92b7122eda835537a6bbafb41beb858f38aed538 (patch) | |
| tree | 50016765154cded7c83ce8b30c2633af76fc0c23 /src/xml/dom/qdom.cpp | |
| parent | feab484b8d2f879bee4d13aa79998f4961d41804 (diff) | |
Remove dead code
This code has been deprecated in Qt 5.
Change-Id: Ia8e0bc791ac1f43df7124b4f30db3d0bb9966015
Reviewed-by: Alex Blasche <[email protected]>
Diffstat (limited to 'src/xml/dom/qdom.cpp')
| -rw-r--r-- | src/xml/dom/qdom.cpp | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/src/xml/dom/qdom.cpp b/src/xml/dom/qdom.cpp index 43e9034ee9e..5f8a93e290a 100644 --- a/src/xml/dom/qdom.cpp +++ b/src/xml/dom/qdom.cpp @@ -6125,18 +6125,9 @@ bool QDomDocument::setContent(const QString& text, bool namespaceProcessing, QSt if (!impl) impl = new QDomDocumentPrivate(); -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) && QT_DEPRECATED_SINCE(5, 15) -QT_WARNING_PUSH -QT_WARNING_DISABLE_DEPRECATED - QXmlInputSource source; - source.setData(text); - return IMPL->setContent(&source, namespaceProcessing, errorMsg, errorLine, errorColumn); -QT_WARNING_POP -#else QXmlStreamReader streamReader(text); streamReader.setNamespaceProcessing(namespaceProcessing); return IMPL->setContent(&streamReader, namespaceProcessing, errorMsg, errorLine, errorColumn); -#endif } /*! @@ -6197,19 +6188,9 @@ bool QDomDocument::setContent(const QByteArray &data, bool namespaceProcessing, if (!impl) impl = new QDomDocumentPrivate(); -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) && QT_DEPRECATED_SINCE(5, 15) - QBuffer buf; - buf.setData(data); -QT_WARNING_PUSH -QT_WARNING_DISABLE_DEPRECATED - QXmlInputSource source(&buf); -QT_WARNING_POP - return IMPL->setContent(&source, namespaceProcessing, errorMsg, errorLine, errorColumn); -#else QXmlStreamReader streamReader(data); streamReader.setNamespaceProcessing(namespaceProcessing); return IMPL->setContent(&streamReader, namespaceProcessing, errorMsg, errorLine, errorColumn); -#endif } /*! |