Merge "Merge remote-tracking branch 'origin/5.13' into dev"

2 files changed, 0 insertions, 245 deletions

diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/simpleparse/handler.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/simpleparse/handler.cpp
deleted file mode 100644
index 1bb2e805e..000000000
--- a/sources/pyside2/doc/codesnippets/doc/src/snippets/simpleparse/handler.cpp
+++ /dev/null
@@ -1,148 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of Qt for Python.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*
-handler.cpp
-
-Provides a handler for processing XML elements found by the reader.
-
-The handler stores the names of elements it finds and their indentation
-levels. The indentation level is initially set to zero.
-When a starting element is found, the indentation level is increased;
-when an ending element is found, the indentation level is decreased.
-*/
-
-#include <QDebug>
-#include "handler.h"
-
-/*!
-    Reset the state of the handler to ensure that new documents are
-    read correctly.
-
-    We return true to indicate that parsing should continue.
-*/
-
-bool Handler::startDocument()
-{
-    elementName.clear();
-    elementIndentation.clear();
-    indentationLevel = 0;
-
-    return true;
-}
-
-/*!
-    Process each starting element in the XML document.
-
-    Append the element name to the list of elements found; add its
-    corresponding indentation level to the list of indentation levels.
-
-    Increase the level of indentation by one column.
-
-    We return true to indicate that parsing should continue.
-*/
-
-bool Handler::startElement(const QString &, const QString &,
-    const QString & qName, const QXmlAttributes &)
-{
-    elementName.append(qName);
-    elementIndentation.append(indentationLevel);
-    indentationLevel += 1;
-
-    return true;
-}
-
-/*!
-    Process each ending element in the XML document.
-
-    Decrease the level of indentation by one column.
-
-    We return true to indicate that parsing should continue.
-*/
-
-bool Handler::endElement(const QString &, const QString &,
-    const QString &)
-{
-    indentationLevel -= 1;
-
-    return true;
-}
-
-/*!
-    Report a fatal parsing error, and return false to indicate to the reader
-    that parsing should stop.
-*/
-
-bool Handler::fatalError (const QXmlParseException & exception)
-{
-    qWarning() << QString("Fatal error on line %1, column %2: %3").arg(
-        exception.lineNumber()).arg(exception.columnNumber()).arg(
-        exception.message());
-
-    return false;
-}
-
-/*!
-    Return the list of element names found.
-*/
-
-QStringList& Handler::names ()
-{
-    return elementName;
-}
-
-/*!
-    Return the list of indentations used for each element found.
-*/
-
-QList<int>& Handler::indentations ()
-{
-    return elementIndentation;
-}
diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/simpleparse/main.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/simpleparse/main.cpp
deleted file mode 100644
index 810e442d1..000000000
--- a/sources/pyside2/doc/codesnippets/doc/src/snippets/simpleparse/main.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of Qt for Python.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <qfile.h>
-#include <qxml.h>
-#include "handler.h"
-
-#include <iostream>
-
-int main(int argc, char **argv)
-{
-    if (argc != 2) {
-        std::cout << "Usage: " << argv[0] << " <filename>" << std::endl;
-        return 1;
-    }
-
-    QFile *file = new QFile(argv[1]);
-
-//! [0]
-    xmlReader = QXmlSimpleReader()
-    source = QXmlInputSource(filename)
-//! [0]
-
-//! [1]
-    handler = Handler()
-    xmlReader.setContentHandler(handler)
-    xmlReader.setErrorHandler(handler)
-//! [1]
-
-//! [2]
-    ok = xmlReader.parse(source)
-
-    if not ok:
-        print "Parsing failed."
-//! [2]
-    else {
-        QStringList names = handler->names();
-        QList<int> indentations = handler->indentations();
-
-        int items = names.count();
-
-        for (int i = 0; i < items; ++i) {
-            for (int j = 0; j < indentations[i]; ++j)
-                std::cout << " ";
-            std::cout << names[i].toLocal8Bit().constData() << std::endl;
-        }
-    }
-
-    return 0;
-}