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

3 files changed, 0 insertions, 322 deletions

diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/textdocument-blocks/main.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/textdocument-blocks/main.cpp
deleted file mode 100644
index 42d8bc990..000000000
--- a/sources/pyside2/doc/codesnippets/doc/src/snippets/textdocument-blocks/main.cpp
+++ /dev/null
@@ -1,62 +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 <QtWidgets>
-
-#include "mainwindow.h"
-
-int main(int argc, char *argv[])
-{
-    QApplication app(argc, argv);
-    MainWindow *window = new MainWindow;
-    window->resize(640, 480);
-    window->show();
-    return app.exec();
-}
diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/textdocument-blocks/mainwindow.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/textdocument-blocks/mainwindow.cpp
deleted file mode 100644
index 33a08e4e0..000000000
--- a/sources/pyside2/doc/codesnippets/doc/src/snippets/textdocument-blocks/mainwindow.cpp
+++ /dev/null
@@ -1,166 +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 <QtWidgets>
-
-#include "mainwindow.h"
-#include "xmlwriter.h"
-
-MainWindow::MainWindow()
-{
-    QMenu *fileMenu = new QMenu(tr("&File"));
-
-    QAction *saveAction = fileMenu->addAction(tr("&Save..."));
-    saveAction->setShortcut(tr("Ctrl+S"));
-
-    QAction *quitAction = fileMenu->addAction(tr("E&xit"));
-    quitAction->setShortcut(tr("Ctrl+Q"));
-
-    QMenu *insertMenu = new QMenu(tr("&Insert"));
-
-    QAction *calendarAction = insertMenu->addAction(tr("&Calendar"));
-    calendarAction->setShortcut(tr("Ctrl+I"));
-
-    menuBar()->addMenu(fileMenu);
-    menuBar()->addMenu(insertMenu);
-
-//! [0]
-    editor = new QTextEdit(this);
-//! [0]
-
-    connect(saveAction, SIGNAL(triggered()), this, SLOT(saveFile()));
-    connect(quitAction, SIGNAL(triggered()), this, SLOT(close()));
-    connect(calendarAction, SIGNAL(triggered()), this, SLOT(insertCalendar()));
-
-    setCentralWidget(editor);
-    setWindowTitle(tr("Text Document Writer"));
-}
-
-void MainWindow::saveFile()
-{
-    QString fileName = QFileDialog::getSaveFileName(this,
-        tr("Save document as:"), "", tr("XML (*.xml)"));
-
-    if (!fileName.isEmpty()) {
-        if (writeXml(fileName))
-            setWindowTitle(fileName);
-        else
-            QMessageBox::warning(this, tr("Warning"),
-                tr("Failed to save the document."), QMessageBox::Cancel,
-                QMessageBox::NoButton);
-    }
-}
-
-void MainWindow::insertCalendar()
-{
-//! [1]
-    QTextCursor cursor(editor->textCursor());
-    cursor.movePosition(QTextCursor::Start); 
-
-    QTextCharFormat format(cursor.charFormat());
-    format.setFontFamily("Courier");
-    
-    QTextCharFormat boldFormat = format;
-    boldFormat.setFontWeight(QFont::Bold);
-
-    cursor.insertBlock();
-    cursor.insertText(" ", boldFormat);
-
-    QDate date = QDate::currentDate();
-    int year = date.year(), month = date.month();
-
-    for (int weekDay = 1; weekDay <= 7; ++weekDay) {
-        cursor.insertText(QString("%1 ").arg(QDate::shortDayName(weekDay), 3),
-            boldFormat);
-    }
-
-    cursor.insertBlock();
-    cursor.insertText(" ", format);
-
-    for (int column = 1; column < QDate(year, month, 1).dayOfWeek(); ++column) {
-        cursor.insertText("    ", format);
-    }
-
-    for (int day = 1; day <= date.daysInMonth(); ++day) {
-//! [1] //! [2]
-        int weekDay = QDate(year, month, day).dayOfWeek();
-
-        if (QDate(year, month, day) == date)
-            cursor.insertText(QString("%1 ").arg(day, 3), boldFormat);
-        else
-            cursor.insertText(QString("%1 ").arg(day, 3), format);
-
-        if (weekDay == 7) {
-            cursor.insertBlock();
-            cursor.insertText(" ", format);
-        }
-//! [2] //! [3]
-    }
-//! [3]
-}
-
-bool MainWindow::writeXml(const QString &fileName)
-{
-    XmlWriter documentWriter(editor->document());
-
-    QDomDocument *domDocument = documentWriter.toXml();
-    QFile file(fileName);
-
-    if (file.open(QFile::WriteOnly)) {
-        QTextStream textStream(&file);
-        textStream.setCodec(QTextCodec::codecForName("UTF-8"));
-        
-        textStream << domDocument->toString(1).toUtf8();
-        file.close();
-        return true;
-    }
-    else
-        return false;
-}
diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/textdocument-blocks/xmlwriter.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/textdocument-blocks/xmlwriter.cpp
deleted file mode 100644
index a03a130f2..000000000
--- a/sources/pyside2/doc/codesnippets/doc/src/snippets/textdocument-blocks/xmlwriter.cpp
+++ /dev/null
@@ -1,94 +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 <QtWidgets>
-
-#include "xmlwriter.h"
-
-QDomDocument *XmlWriter::toXml()
-{
-    QDomImplementation implementation;
-    QDomDocumentType docType = implementation.createDocumentType(
-        "scribe-document", "scribe", "qtsoftware.com/scribe");
-
-    document = new QDomDocument(docType);
-
-    // ### This processing instruction is required to ensure that any kind
-    // of encoding is given when the document is written.
-    QDomProcessingInstruction process = document->createProcessingInstruction(
-        "xml", "version=\"1.0\" encoding=\"utf-8\"");
-    document->appendChild(process);
-
-    QDomElement documentElement = document->createElement("document");
-    document->appendChild(documentElement);
-
-    QTextBlock firstBlock = textDocument->begin();
-    createItems(documentElement, firstBlock);
-
-    return document;
-}
-
-void XmlWriter::createItems(QDomElement &parent, const QTextBlock &block)
-{
-    QTextBlock currentBlock = block;
-
-    while (currentBlock.isValid()) {
-        QDomElement blockElement = document->createElement("block");
-        blockElement.setAttribute("length", currentBlock.length());
-        parent.appendChild(blockElement);
-
-        if (!(currentBlock.text().isNull())) {
-            QDomText textNode = document->createTextNode(currentBlock.text());
-            blockElement.appendChild(textNode);
-        }
-
-        currentBlock = currentBlock.next();
-    }
-}