From 7b67fba8bb21b06d423b68911b227fd1db22b1be Mon Sep 17 00:00:00 2001 From: Antti Kokko Date: Mon, 28 Aug 2017 14:54:17 +0300 Subject: Add change file for Qt 5.6.3 This is just initial commit. Maintainers, please take over this, do needed modifications & get approved as soon as possible Task-number: QTBUG-62723 Change-Id: I34d12daba918b9ebfe6f3404219b75b72f8f6f85 Reviewed-by: Friedemann Kleint --- dist/changes-5.6.3 | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 dist/changes-5.6.3 diff --git a/dist/changes-5.6.3 b/dist/changes-5.6.3 new file mode 100644 index 0000000..f0feae1 --- /dev/null +++ b/dist/changes-5.6.3 @@ -0,0 +1,24 @@ +Qt 5.6.3 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.6.0. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + + http://doc.qt.io/qt-5/index.html + +The Qt version 5.6 series is binary compatible with the 5.5.x series. +Applications compiled for 5.5 will continue to run with 5.6. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + + https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +**************************************************************************** +* Library * +**************************************************************************** + + - This release contains only minor code improvements. -- cgit v1.2.1 From 1f7eed111bd1e2b6ba0ffbb236be3ca1b6073097 Mon Sep 17 00:00:00 2001 From: Gatis Paeglis Date: Tue, 19 Sep 2017 13:42:37 +0200 Subject: remove wince leftovers Change-Id: I0579f73576722ebe68c3574f48934b15997aa035 Reviewed-by: Friedemann Kleint --- src/xmlpatterns/xmlpatterns.pro | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/xmlpatterns/xmlpatterns.pro b/src/xmlpatterns/xmlpatterns.pro index 5244bb1..eae2ea8 100644 --- a/src/xmlpatterns/xmlpatterns.pro +++ b/src/xmlpatterns/xmlpatterns.pro @@ -26,13 +26,4 @@ include($$PWD/type/type.pri) include($$PWD/utils/utils.pri) include($$PWD/qobjectmodel/qobjectmodel.pri, "", true) -wince* { - # The Microsoft MIPS compiler crashes if /Og is specified. - # -O2/1 expands to /Og plus additional arguments. - contains(DEFINES, MIPS) { - QMAKE_CXXFLAGS_RELEASE ~= s/-O2/-Oi -Ot -Oy -Ob2/ - QMAKE_CXXFLAGS_RELEASE ~= s/-O1/-Os -Oy -Ob2/ - } -} - load(qt_module) -- cgit v1.2.1 From f8a92101077943131b22011ae48b69687f51a7f1 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Wed, 20 Sep 2017 13:44:59 +0200 Subject: Win: Show proper descriptions for tools Task-number: QTBUG-61970 Change-Id: Ia328bb40e8a5f607d5e1ba33f4386ad250fbbd7d Reviewed-by: Oswald Buddenhagen --- tools/xmlpatterns/xmlpatterns.pro | 1 + tools/xmlpatternsvalidator/xmlpatternsvalidator.pro | 1 + 2 files changed, 2 insertions(+) diff --git a/tools/xmlpatterns/xmlpatterns.pro b/tools/xmlpatterns/xmlpatterns.pro index 0f1ee4f..5ab4236 100644 --- a/tools/xmlpatterns/xmlpatterns.pro +++ b/tools/xmlpatterns/xmlpatterns.pro @@ -11,6 +11,7 @@ HEADERS = main.h \ qapplicationargument.cpp \ qapplicationargumentparser.cpp +QMAKE_TARGET_DESCRIPTION = "Qt XQuery Evaluator" load(qt_tool) # with c++11 / __STRICT_ANSI__ mingw.org stdio.h doesn't declare e.g. _fileno diff --git a/tools/xmlpatternsvalidator/xmlpatternsvalidator.pro b/tools/xmlpatternsvalidator/xmlpatternsvalidator.pro index af9469f..beb9bdd 100644 --- a/tools/xmlpatternsvalidator/xmlpatternsvalidator.pro +++ b/tools/xmlpatternsvalidator/xmlpatternsvalidator.pro @@ -3,4 +3,5 @@ QT = core xmlpatterns SOURCES = main.cpp HEADERS = main.h +QMAKE_TARGET_DESCRIPTION = "Qt XML Schema Validator" load(qt_tool) -- cgit v1.2.1 From 8d7e1e0ec06724a4d332c050e9260530c708e773 Mon Sep 17 00:00:00 2001 From: Antti Kokko Date: Thu, 21 Sep 2017 15:54:20 +0300 Subject: Add changes file for Qt 5.9.2 Change-Id: I0b1f8b2ae068c1f6489d67fd4a4db51e275b4ad5 Reviewed-by: Friedemann Kleint --- dist/changes-5.9.2 | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 dist/changes-5.9.2 diff --git a/dist/changes-5.9.2 b/dist/changes-5.9.2 new file mode 100644 index 0000000..39fd0d9 --- /dev/null +++ b/dist/changes-5.9.2 @@ -0,0 +1,24 @@ +Qt 5.9.2 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.9.0. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + +http://doc.qt.io/qt-5/index.html + +The Qt version 5.9 series is binary compatible with the 5.8.x series. +Applications compiled for 5.8 will continue to run with 5.9. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +**************************************************************************** +* Qt 5.9.2 Changes * +**************************************************************************** + +- This release contains only minor code improvements. -- cgit v1.2.1 From 189c0c1ad9ae2dee6359ec0cde6049fdf4c6aaf1 Mon Sep 17 00:00:00 2001 From: Gatis Paeglis Date: Tue, 19 Sep 2017 14:08:16 +0200 Subject: examples: remove traces of the Maemo and Q_WS_SIMULATOR Maemo part: This kind of amends what was done in qtbase 2 years and 7 months ago by 5432f2c7a1ff02e1ee0e07e442ceb6c12ca66098. Q_WS_SIMULATOR part: This was all dead code, because nothing sets Q_WS_SIMULATOR in Qt 5. Change-Id: I8af66123e332cd8911a73c11893d674b8102e474 Reviewed-by: Friedemann Kleint --- examples/xmlpatterns/filetree/filetree.pro | 5 - .../recipes/forms/querywidget_mobiles.ui | 87 -------------- examples/xmlpatterns/recipes/querymainwindow.h | 6 +- examples/xmlpatterns/recipes/recipes.pro | 6 +- examples/xmlpatterns/schema/mainwindow.h | 6 +- examples/xmlpatterns/schema/schema.pro | 5 +- examples/xmlpatterns/schema/schema_mobiles.ui | 130 --------------------- examples/xmlpatterns/xquery/xquery.pro | 2 - 8 files changed, 4 insertions(+), 243 deletions(-) delete mode 100644 examples/xmlpatterns/recipes/forms/querywidget_mobiles.ui delete mode 100644 examples/xmlpatterns/schema/schema_mobiles.ui diff --git a/examples/xmlpatterns/filetree/filetree.pro b/examples/xmlpatterns/filetree/filetree.pro index 4b7d5f8..cb78c40 100644 --- a/examples/xmlpatterns/filetree/filetree.pro +++ b/examples/xmlpatterns/filetree/filetree.pro @@ -7,8 +7,3 @@ INCLUDEPATH += ../shared/ target.path = $$[QT_INSTALL_EXAMPLES]/xmlpatterns/filetree INSTALLS += target - -maemo5: CONFIG += qt_example - -maemo5: warning(This example might not fully work on Maemo platform) -simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/xmlpatterns/recipes/forms/querywidget_mobiles.ui b/examples/xmlpatterns/recipes/forms/querywidget_mobiles.ui deleted file mode 100644 index b4600e9..0000000 --- a/examples/xmlpatterns/recipes/forms/querywidget_mobiles.ui +++ /dev/null @@ -1,87 +0,0 @@ - - - QueryWidget - - - - 0 - 0 - 453 - 583 - - - - Recipes XQuery Example - - - - - - - 0 - - - false - - - - Input Document - - - - - - Qt::NoTextInteraction - - - false - - - - - - - - Query selection - - - - - - - - - Qt::NoTextInteraction - - - false - - - - - - - - Output Document - - - - - - Qt::NoTextInteraction - - - false - - - - - - - - - - - - - diff --git a/examples/xmlpatterns/recipes/querymainwindow.h b/examples/xmlpatterns/recipes/querymainwindow.h index 4f8119a..25ffaab 100644 --- a/examples/xmlpatterns/recipes/querymainwindow.h +++ b/examples/xmlpatterns/recipes/querymainwindow.h @@ -43,11 +43,7 @@ #include -#if defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR) - #include "ui_querywidget_mobiles.h" -#else - #include "ui_querywidget.h" -#endif +#include "ui_querywidget.h" QT_BEGIN_NAMESPACE class QComboBox; diff --git a/examples/xmlpatterns/recipes/recipes.pro b/examples/xmlpatterns/recipes/recipes.pro index 633138b..b564e0a 100644 --- a/examples/xmlpatterns/recipes/recipes.pro +++ b/examples/xmlpatterns/recipes/recipes.pro @@ -1,6 +1,5 @@ QT += widgets xmlpatterns -FORMS += forms/querywidget.ui \ - forms/querywidget_mobiles.ui +FORMS += forms/querywidget.ui HEADERS = querymainwindow.h ../shared/xmlsyntaxhighlighter.h RESOURCES = recipes.qrc SOURCES = main.cpp querymainwindow.cpp ../shared/xmlsyntaxhighlighter.cpp @@ -8,6 +7,3 @@ INCLUDEPATH += ../shared/ target.path = $$[QT_INSTALL_EXAMPLES]/xmlpatterns/recipes INSTALLS += target - -maemo5: CONFIG += qt_example - diff --git a/examples/xmlpatterns/schema/mainwindow.h b/examples/xmlpatterns/schema/mainwindow.h index e36665a..d34f145 100644 --- a/examples/xmlpatterns/schema/mainwindow.h +++ b/examples/xmlpatterns/schema/mainwindow.h @@ -43,11 +43,7 @@ #include -#if defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR) - #include "ui_schema_mobiles.h" -#else - #include "ui_schema.h" -#endif +#include "ui_schema.h" //! [0] class MainWindow : public QMainWindow, diff --git a/examples/xmlpatterns/schema/schema.pro b/examples/xmlpatterns/schema/schema.pro index dd56375..ded65a1 100644 --- a/examples/xmlpatterns/schema/schema.pro +++ b/examples/xmlpatterns/schema/schema.pro @@ -1,5 +1,5 @@ QT += widgets xmlpatterns -FORMS += schema.ui schema_mobiles.ui +FORMS += schema.ui HEADERS = mainwindow.h ../shared/xmlsyntaxhighlighter.h RESOURCES = schema.qrc SOURCES = main.cpp mainwindow.cpp ../shared/xmlsyntaxhighlighter.cpp @@ -7,6 +7,3 @@ INCLUDEPATH += ../shared/ target.path = $$[QT_INSTALL_EXAMPLES]/xmlpatterns/schema INSTALLS += target - -maemo5: CONFIG += qt_example - diff --git a/examples/xmlpatterns/schema/schema_mobiles.ui b/examples/xmlpatterns/schema/schema_mobiles.ui deleted file mode 100644 index 009d0aa..0000000 --- a/examples/xmlpatterns/schema/schema_mobiles.ui +++ /dev/null @@ -1,130 +0,0 @@ - - - SchemaMainWindow - - - - 0 - 0 - 187 - 179 - - - - XML Schema Validation - - - - - QLayout::SetNoConstraint - - - - - 1 - - - - XML Schema - - - - - - - 0 - 0 - - - - 3 - - - - - - - - - - - XML Instance - - - - QLayout::SetNoConstraint - - - - - - 0 - 0 - - - - 3 - - - - - - - - 0 - 0 - - - - - 8 - - - - false - - - - - - - - - - 0 - 0 - - - - Not validated - - - true - - - - - - - - 0 - 0 - - - - Validate - - - - - - - - - - - - - - - diff --git a/examples/xmlpatterns/xquery/xquery.pro b/examples/xmlpatterns/xquery/xquery.pro index ee1c9c8..09d0c4d 100644 --- a/examples/xmlpatterns/xquery/xquery.pro +++ b/examples/xmlpatterns/xquery/xquery.pro @@ -1,4 +1,2 @@ TEMPLATE = aux EXAMPLE_FILES = globalVariables - -maemo5: CONFIG += qt_example -- cgit v1.2.1 From 9e26cfa167778f3d9444aedcb23c8476683b3785 Mon Sep 17 00:00:00 2001 From: Gatis Paeglis Date: Tue, 19 Sep 2017 15:30:48 +0200 Subject: examples: minor code revamping in recipes Task-number: QTBUG-60660 Change-Id: I396f64c770f4ccbf5b2bbd6240ccb4618df70b23 Reviewed-by: Friedemann Kleint --- examples/xmlpatterns/recipes/querymainwindow.cpp | 17 +++++++++-------- examples/xmlpatterns/recipes/querymainwindow.h | 2 +- examples/xmlpatterns/shared/xmlsyntaxhighlighter.h | 2 +- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/examples/xmlpatterns/recipes/querymainwindow.cpp b/examples/xmlpatterns/recipes/querymainwindow.cpp index 9a543d5..f24185b 100644 --- a/examples/xmlpatterns/recipes/querymainwindow.cpp +++ b/examples/xmlpatterns/recipes/querymainwindow.cpp @@ -38,15 +38,15 @@ ** ****************************************************************************/ -#include -#include +#include +#include #include #include "querymainwindow.h" #include "xmlsyntaxhighlighter.h" //! [0] -QueryMainWindow::QueryMainWindow() : ui_defaultQueries(0) +QueryMainWindow::QueryMainWindow() { setupUi(this); @@ -55,14 +55,15 @@ QueryMainWindow::QueryMainWindow() : ui_defaultQueries(0) ui_defaultQueries = findChild("defaultQueries"); QMetaObject::connectSlotsByName(this); - connect(ui_defaultQueries, SIGNAL(currentIndexChanged(int)), SLOT(displayQuery(int))); + + connect(ui_defaultQueries, QOverload::of(&QComboBox::currentIndexChanged), + this, &QueryMainWindow::displayQuery); loadInputFile(); const QStringList queries(QDir(":/files/", "*.xq").entryList()); - int len = queries.count(); - for(int i = 0; i < len; ++i) - ui_defaultQueries->addItem(queries.at(i)); - if (len > 0) + for (const auto &query : queries) + ui_defaultQueries->addItem(query); + if (queries.count() > 0) displayQuery(0); } //! [0] diff --git a/examples/xmlpatterns/recipes/querymainwindow.h b/examples/xmlpatterns/recipes/querymainwindow.h index 25ffaab..7961d88 100644 --- a/examples/xmlpatterns/recipes/querymainwindow.h +++ b/examples/xmlpatterns/recipes/querymainwindow.h @@ -62,7 +62,7 @@ public slots: void displayQuery(int index); private: - QComboBox* ui_defaultQueries; + QComboBox *ui_defaultQueries = nullptr; void evaluate(const QString &str); void loadInputFile(); diff --git a/examples/xmlpatterns/shared/xmlsyntaxhighlighter.h b/examples/xmlpatterns/shared/xmlsyntaxhighlighter.h index 7a104d5..bdd379c 100644 --- a/examples/xmlpatterns/shared/xmlsyntaxhighlighter.h +++ b/examples/xmlpatterns/shared/xmlsyntaxhighlighter.h @@ -47,7 +47,7 @@ class XmlSyntaxHighlighter : public QSyntaxHighlighter { public: - XmlSyntaxHighlighter(QTextDocument *parent = 0); + explicit XmlSyntaxHighlighter(QTextDocument *parent = nullptr); protected: virtual void highlightBlock(const QString &text); -- cgit v1.2.1 From cabba031ad08a6134b83f4a5bbfb191a87acf461 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 6 Oct 2017 18:01:27 +0200 Subject: Bump version Change-Id: I3605602b477d2a6ea68ae2e00651651671ac90e4 --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index e1c4e49..dea15b4 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) CONFIG += warning_clean DEFINES += QT_NO_FOREACH -MODULE_VERSION = 5.9.2 +MODULE_VERSION = 5.9.3 -- cgit v1.2.1 From a0006e238d5e788186ab0a6f8865a130d2c2e194 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Thu, 28 Sep 2017 17:05:52 +0200 Subject: Fix outdated BSD license header Change-Id: I90b4636aeaf7465f5938ff3454d735cf67816d98 Reviewed-by: Jani Heikkinen --- examples/xmlpatterns/filetree/filetree.cpp | 16 +++++++++++++--- examples/xmlpatterns/filetree/filetree.h | 16 +++++++++++++--- examples/xmlpatterns/filetree/main.cpp | 16 +++++++++++++--- examples/xmlpatterns/filetree/mainwindow.cpp | 16 +++++++++++++--- examples/xmlpatterns/filetree/mainwindow.h | 16 +++++++++++++--- examples/xmlpatterns/recipes/main.cpp | 16 +++++++++++++--- examples/xmlpatterns/recipes/querymainwindow.cpp | 16 +++++++++++++--- examples/xmlpatterns/recipes/querymainwindow.h | 16 +++++++++++++--- examples/xmlpatterns/schema/main.cpp | 16 +++++++++++++--- examples/xmlpatterns/schema/mainwindow.cpp | 16 +++++++++++++--- examples/xmlpatterns/schema/mainwindow.h | 16 +++++++++++++--- examples/xmlpatterns/shared/xmlsyntaxhighlighter.cpp | 16 +++++++++++++--- examples/xmlpatterns/shared/xmlsyntaxhighlighter.h | 16 +++++++++++++--- examples/xmlpatterns/xquery/globalVariables/globals.cpp | 16 +++++++++++++--- .../doc/snippets/code/doc_src_qtxmlpatterns.qdoc | 16 +++++++++++++--- .../code/src_xmlpatterns_api_qabstracturiresolver.cpp | 16 +++++++++++++--- .../src_xmlpatterns_api_qabstractxmlforwarditerator.cpp | 16 +++++++++++++--- .../code/src_xmlpatterns_api_qabstractxmlnodemodel.cpp | 16 +++++++++++++--- .../code/src_xmlpatterns_api_qabstractxmlreceiver.cpp | 16 +++++++++++++--- .../code/src_xmlpatterns_api_qsimplexmlnodemodel.cpp | 16 +++++++++++++--- .../snippets/code/src_xmlpatterns_api_qxmlformatter.cpp | 16 +++++++++++++--- .../doc/snippets/code/src_xmlpatterns_api_qxmlname.cpp | 16 +++++++++++++--- .../doc/snippets/code/src_xmlpatterns_api_qxmlquery.cpp | 16 +++++++++++++--- .../code/src_xmlpatterns_api_qxmlresultitems.cpp | 16 +++++++++++++--- .../snippets/code/src_xmlpatterns_api_qxmlserializer.cpp | 16 +++++++++++++--- src/xmlpatterns/doc/snippets/doc_src_qtxmlpatterns.cpp | 16 +++++++++++++--- src/xmlpatterns/doc/snippets/doc_src_qtxmlpatterns.pro | 16 +++++++++++++--- .../doc/snippets/qxmlquery/bindingExample.cpp | 16 +++++++++++++--- src/xmlpatterns/doc/snippets/qxmlschema/main.cpp | 16 +++++++++++++--- .../doc/snippets/qxmlschemavalidator/main.cpp | 16 +++++++++++++--- 30 files changed, 390 insertions(+), 90 deletions(-) diff --git a/examples/xmlpatterns/filetree/filetree.cpp b/examples/xmlpatterns/filetree/filetree.cpp index 8b8d2fa..3176d52 100644 --- a/examples/xmlpatterns/filetree/filetree.cpp +++ b/examples/xmlpatterns/filetree/filetree.cpp @@ -1,12 +1,22 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: +** 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 diff --git a/examples/xmlpatterns/filetree/filetree.h b/examples/xmlpatterns/filetree/filetree.h index 74e4543..2836f0f 100644 --- a/examples/xmlpatterns/filetree/filetree.h +++ b/examples/xmlpatterns/filetree/filetree.h @@ -1,12 +1,22 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: +** 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 diff --git a/examples/xmlpatterns/filetree/main.cpp b/examples/xmlpatterns/filetree/main.cpp index 9961a95..0bffb19 100644 --- a/examples/xmlpatterns/filetree/main.cpp +++ b/examples/xmlpatterns/filetree/main.cpp @@ -1,12 +1,22 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: +** 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 diff --git a/examples/xmlpatterns/filetree/mainwindow.cpp b/examples/xmlpatterns/filetree/mainwindow.cpp index f8f8d52..3dc42b5 100644 --- a/examples/xmlpatterns/filetree/mainwindow.cpp +++ b/examples/xmlpatterns/filetree/mainwindow.cpp @@ -1,12 +1,22 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: +** 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 diff --git a/examples/xmlpatterns/filetree/mainwindow.h b/examples/xmlpatterns/filetree/mainwindow.h index 37e8515..3d2ec04 100644 --- a/examples/xmlpatterns/filetree/mainwindow.h +++ b/examples/xmlpatterns/filetree/mainwindow.h @@ -1,12 +1,22 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: +** 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 diff --git a/examples/xmlpatterns/recipes/main.cpp b/examples/xmlpatterns/recipes/main.cpp index d7e35d0..9994698 100644 --- a/examples/xmlpatterns/recipes/main.cpp +++ b/examples/xmlpatterns/recipes/main.cpp @@ -1,12 +1,22 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: +** 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 diff --git a/examples/xmlpatterns/recipes/querymainwindow.cpp b/examples/xmlpatterns/recipes/querymainwindow.cpp index 9a543d5..f73e5de 100644 --- a/examples/xmlpatterns/recipes/querymainwindow.cpp +++ b/examples/xmlpatterns/recipes/querymainwindow.cpp @@ -1,12 +1,22 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: +** 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 diff --git a/examples/xmlpatterns/recipes/querymainwindow.h b/examples/xmlpatterns/recipes/querymainwindow.h index 4f8119a..247ca61 100644 --- a/examples/xmlpatterns/recipes/querymainwindow.h +++ b/examples/xmlpatterns/recipes/querymainwindow.h @@ -1,12 +1,22 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: +** 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 diff --git a/examples/xmlpatterns/schema/main.cpp b/examples/xmlpatterns/schema/main.cpp index 10fb8f2..ac44ebd 100644 --- a/examples/xmlpatterns/schema/main.cpp +++ b/examples/xmlpatterns/schema/main.cpp @@ -1,12 +1,22 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: +** 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 diff --git a/examples/xmlpatterns/schema/mainwindow.cpp b/examples/xmlpatterns/schema/mainwindow.cpp index 688ecf0..2feccb6 100644 --- a/examples/xmlpatterns/schema/mainwindow.cpp +++ b/examples/xmlpatterns/schema/mainwindow.cpp @@ -1,12 +1,22 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: +** 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 diff --git a/examples/xmlpatterns/schema/mainwindow.h b/examples/xmlpatterns/schema/mainwindow.h index e36665a..8ff875d 100644 --- a/examples/xmlpatterns/schema/mainwindow.h +++ b/examples/xmlpatterns/schema/mainwindow.h @@ -1,12 +1,22 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: +** 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 diff --git a/examples/xmlpatterns/shared/xmlsyntaxhighlighter.cpp b/examples/xmlpatterns/shared/xmlsyntaxhighlighter.cpp index 385fd11..409a4a0 100644 --- a/examples/xmlpatterns/shared/xmlsyntaxhighlighter.cpp +++ b/examples/xmlpatterns/shared/xmlsyntaxhighlighter.cpp @@ -1,12 +1,22 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: +** 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 diff --git a/examples/xmlpatterns/shared/xmlsyntaxhighlighter.h b/examples/xmlpatterns/shared/xmlsyntaxhighlighter.h index 7a104d5..eace6be 100644 --- a/examples/xmlpatterns/shared/xmlsyntaxhighlighter.h +++ b/examples/xmlpatterns/shared/xmlsyntaxhighlighter.h @@ -1,12 +1,22 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: +** 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 diff --git a/examples/xmlpatterns/xquery/globalVariables/globals.cpp b/examples/xmlpatterns/xquery/globalVariables/globals.cpp index d1e10fd..079b71e 100644 --- a/examples/xmlpatterns/xquery/globalVariables/globals.cpp +++ b/examples/xmlpatterns/xquery/globalVariables/globals.cpp @@ -1,12 +1,22 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: +** 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 diff --git a/src/xmlpatterns/doc/snippets/code/doc_src_qtxmlpatterns.qdoc b/src/xmlpatterns/doc/snippets/code/doc_src_qtxmlpatterns.qdoc index db9df52..c003a56 100644 --- a/src/xmlpatterns/doc/snippets/code/doc_src_qtxmlpatterns.qdoc +++ b/src/xmlpatterns/doc/snippets/code/doc_src_qtxmlpatterns.qdoc @@ -1,12 +1,22 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: +** 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 diff --git a/src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qabstracturiresolver.cpp b/src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qabstracturiresolver.cpp index cb47bcb..3f4c0ce 100644 --- a/src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qabstracturiresolver.cpp +++ b/src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qabstracturiresolver.cpp @@ -1,12 +1,22 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: +** 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 diff --git a/src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qabstractxmlforwarditerator.cpp b/src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qabstractxmlforwarditerator.cpp index 9ce6b69..35ce418 100644 --- a/src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qabstractxmlforwarditerator.cpp +++ b/src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qabstractxmlforwarditerator.cpp @@ -1,12 +1,22 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: +** 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 diff --git a/src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qabstractxmlnodemodel.cpp b/src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qabstractxmlnodemodel.cpp index 1c0a940..a635f11 100644 --- a/src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qabstractxmlnodemodel.cpp +++ b/src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qabstractxmlnodemodel.cpp @@ -1,12 +1,22 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: +** 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 diff --git a/src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qabstractxmlreceiver.cpp b/src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qabstractxmlreceiver.cpp index 9332cce..37825f4 100644 --- a/src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qabstractxmlreceiver.cpp +++ b/src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qabstractxmlreceiver.cpp @@ -1,12 +1,22 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: +** 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 diff --git a/src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qsimplexmlnodemodel.cpp b/src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qsimplexmlnodemodel.cpp index f657fb3..615470b 100644 --- a/src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qsimplexmlnodemodel.cpp +++ b/src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qsimplexmlnodemodel.cpp @@ -1,12 +1,22 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: +** 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 diff --git a/src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qxmlformatter.cpp b/src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qxmlformatter.cpp index 4875f85..ecb8583 100644 --- a/src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qxmlformatter.cpp +++ b/src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qxmlformatter.cpp @@ -1,12 +1,22 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: +** 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 diff --git a/src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qxmlname.cpp b/src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qxmlname.cpp index d5603d9..b39912c 100644 --- a/src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qxmlname.cpp +++ b/src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qxmlname.cpp @@ -1,12 +1,22 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: +** 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 diff --git a/src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qxmlquery.cpp b/src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qxmlquery.cpp index bfbc925..e6cc433 100644 --- a/src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qxmlquery.cpp +++ b/src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qxmlquery.cpp @@ -1,12 +1,22 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: +** 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 diff --git a/src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qxmlresultitems.cpp b/src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qxmlresultitems.cpp index 8dd9549..a38416a 100644 --- a/src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qxmlresultitems.cpp +++ b/src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qxmlresultitems.cpp @@ -1,12 +1,22 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: +** 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 diff --git a/src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qxmlserializer.cpp b/src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qxmlserializer.cpp index 9332cce..37825f4 100644 --- a/src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qxmlserializer.cpp +++ b/src/xmlpatterns/doc/snippets/code/src_xmlpatterns_api_qxmlserializer.cpp @@ -1,12 +1,22 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: +** 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 diff --git a/src/xmlpatterns/doc/snippets/doc_src_qtxmlpatterns.cpp b/src/xmlpatterns/doc/snippets/doc_src_qtxmlpatterns.cpp index a6abdf4..80c9687 100644 --- a/src/xmlpatterns/doc/snippets/doc_src_qtxmlpatterns.cpp +++ b/src/xmlpatterns/doc/snippets/doc_src_qtxmlpatterns.cpp @@ -1,12 +1,22 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: +** 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 diff --git a/src/xmlpatterns/doc/snippets/doc_src_qtxmlpatterns.pro b/src/xmlpatterns/doc/snippets/doc_src_qtxmlpatterns.pro index ba14368..e1bd378 100644 --- a/src/xmlpatterns/doc/snippets/doc_src_qtxmlpatterns.pro +++ b/src/xmlpatterns/doc/snippets/doc_src_qtxmlpatterns.pro @@ -1,12 +1,22 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: +** 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 diff --git a/src/xmlpatterns/doc/snippets/qxmlquery/bindingExample.cpp b/src/xmlpatterns/doc/snippets/qxmlquery/bindingExample.cpp index 73164b0..fc7f102 100644 --- a/src/xmlpatterns/doc/snippets/qxmlquery/bindingExample.cpp +++ b/src/xmlpatterns/doc/snippets/qxmlquery/bindingExample.cpp @@ -1,12 +1,22 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the config.tests of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: +** 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 diff --git a/src/xmlpatterns/doc/snippets/qxmlschema/main.cpp b/src/xmlpatterns/doc/snippets/qxmlschema/main.cpp index 94460de..b654873 100644 --- a/src/xmlpatterns/doc/snippets/qxmlschema/main.cpp +++ b/src/xmlpatterns/doc/snippets/qxmlschema/main.cpp @@ -1,12 +1,22 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: +** 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 diff --git a/src/xmlpatterns/doc/snippets/qxmlschemavalidator/main.cpp b/src/xmlpatterns/doc/snippets/qxmlschemavalidator/main.cpp index a96bc1d..62e58c9 100644 --- a/src/xmlpatterns/doc/snippets/qxmlschemavalidator/main.cpp +++ b/src/xmlpatterns/doc/snippets/qxmlschemavalidator/main.cpp @@ -1,12 +1,22 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: +** 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 -- cgit v1.2.1 From b257f032350c555ea52a7dad5a52d0312ab93b5c Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Thu, 28 Sep 2017 17:06:11 +0200 Subject: Fix outdated FDL license header Change-Id: I50ac50f96c8ac4bf7023b9488e6a634d3f71e583 Reviewed-by: Jani Heikkinen --- examples/xmlpatterns/filetree/doc/src/filetree.qdoc | 10 +++++----- examples/xmlpatterns/recipes/doc/src/recipes.qdoc | 10 +++++----- examples/xmlpatterns/schema/doc/src/schema.qdoc | 10 +++++----- examples/xmlpatterns/xquery/doc/src/globalVariables.qdoc | 10 +++++----- src/xmlpatterns/doc/src/qtxmlpatterns-examples.qdoc | 10 +++++----- src/xmlpatterns/doc/src/qtxmlpatterns-index.qdoc | 10 +++++----- src/xmlpatterns/doc/src/qtxmlpatterns-module.qdoc | 10 +++++----- src/xmlpatterns/doc/src/xml-patterns.qdoc | 10 +++++----- src/xmlpatterns/doc/src/xquery-introduction.qdoc | 10 +++++----- 9 files changed, 45 insertions(+), 45 deletions(-) diff --git a/examples/xmlpatterns/filetree/doc/src/filetree.qdoc b/examples/xmlpatterns/filetree/doc/src/filetree.qdoc index 796861d..b3dbac5 100644 --- a/examples/xmlpatterns/filetree/doc/src/filetree.qdoc +++ b/examples/xmlpatterns/filetree/doc/src/filetree.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -11,8 +11,8 @@ ** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. ** ** GNU Free Documentation License Usage ** Alternatively, this file may be used under the terms of the GNU Free @@ -20,7 +20,7 @@ ** Foundation and appearing in the file included in the packaging of ** this file. Please review the following information to ensure ** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/examples/xmlpatterns/recipes/doc/src/recipes.qdoc b/examples/xmlpatterns/recipes/doc/src/recipes.qdoc index d1d61f2..8af2646 100644 --- a/examples/xmlpatterns/recipes/doc/src/recipes.qdoc +++ b/examples/xmlpatterns/recipes/doc/src/recipes.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -11,8 +11,8 @@ ** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. ** ** GNU Free Documentation License Usage ** Alternatively, this file may be used under the terms of the GNU Free @@ -20,7 +20,7 @@ ** Foundation and appearing in the file included in the packaging of ** this file. Please review the following information to ensure ** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/examples/xmlpatterns/schema/doc/src/schema.qdoc b/examples/xmlpatterns/schema/doc/src/schema.qdoc index 110c932..fc5919a 100644 --- a/examples/xmlpatterns/schema/doc/src/schema.qdoc +++ b/examples/xmlpatterns/schema/doc/src/schema.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -11,8 +11,8 @@ ** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. ** ** GNU Free Documentation License Usage ** Alternatively, this file may be used under the terms of the GNU Free @@ -20,7 +20,7 @@ ** Foundation and appearing in the file included in the packaging of ** this file. Please review the following information to ensure ** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/examples/xmlpatterns/xquery/doc/src/globalVariables.qdoc b/examples/xmlpatterns/xquery/doc/src/globalVariables.qdoc index b07dc75..0bffe37 100644 --- a/examples/xmlpatterns/xquery/doc/src/globalVariables.qdoc +++ b/examples/xmlpatterns/xquery/doc/src/globalVariables.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -11,8 +11,8 @@ ** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. ** ** GNU Free Documentation License Usage ** Alternatively, this file may be used under the terms of the GNU Free @@ -20,7 +20,7 @@ ** Foundation and appearing in the file included in the packaging of ** this file. Please review the following information to ensure ** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/doc/src/qtxmlpatterns-examples.qdoc b/src/xmlpatterns/doc/src/qtxmlpatterns-examples.qdoc index b4e7924..b22e136 100644 --- a/src/xmlpatterns/doc/src/qtxmlpatterns-examples.qdoc +++ b/src/xmlpatterns/doc/src/qtxmlpatterns-examples.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -11,8 +11,8 @@ ** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. ** ** GNU Free Documentation License Usage ** Alternatively, this file may be used under the terms of the GNU Free @@ -20,7 +20,7 @@ ** Foundation and appearing in the file included in the packaging of ** this file. Please review the following information to ensure ** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/doc/src/qtxmlpatterns-index.qdoc b/src/xmlpatterns/doc/src/qtxmlpatterns-index.qdoc index 41967d6..1df5218 100644 --- a/src/xmlpatterns/doc/src/qtxmlpatterns-index.qdoc +++ b/src/xmlpatterns/doc/src/qtxmlpatterns-index.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -11,8 +11,8 @@ ** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. ** ** GNU Free Documentation License Usage ** Alternatively, this file may be used under the terms of the GNU Free @@ -20,7 +20,7 @@ ** Foundation and appearing in the file included in the packaging of ** this file. Please review the following information to ensure ** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/doc/src/qtxmlpatterns-module.qdoc b/src/xmlpatterns/doc/src/qtxmlpatterns-module.qdoc index 657b091..a7fa7e8 100644 --- a/src/xmlpatterns/doc/src/qtxmlpatterns-module.qdoc +++ b/src/xmlpatterns/doc/src/qtxmlpatterns-module.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -11,8 +11,8 @@ ** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. ** ** GNU Free Documentation License Usage ** Alternatively, this file may be used under the terms of the GNU Free @@ -20,7 +20,7 @@ ** Foundation and appearing in the file included in the packaging of ** this file. Please review the following information to ensure ** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/doc/src/xml-patterns.qdoc b/src/xmlpatterns/doc/src/xml-patterns.qdoc index 407e2d1..956d0c6 100644 --- a/src/xmlpatterns/doc/src/xml-patterns.qdoc +++ b/src/xmlpatterns/doc/src/xml-patterns.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -11,8 +11,8 @@ ** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. ** ** GNU Free Documentation License Usage ** Alternatively, this file may be used under the terms of the GNU Free @@ -20,7 +20,7 @@ ** Foundation and appearing in the file included in the packaging of ** this file. Please review the following information to ensure ** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/doc/src/xquery-introduction.qdoc b/src/xmlpatterns/doc/src/xquery-introduction.qdoc index 49458ac..1c6d82b 100644 --- a/src/xmlpatterns/doc/src/xquery-introduction.qdoc +++ b/src/xmlpatterns/doc/src/xquery-introduction.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -11,8 +11,8 @@ ** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. ** ** GNU Free Documentation License Usage ** Alternatively, this file may be used under the terms of the GNU Free @@ -20,7 +20,7 @@ ** Foundation and appearing in the file included in the packaging of ** this file. Please review the following information to ensure ** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. ** $QT_END_LICENSE$ ** ****************************************************************************/ -- cgit v1.2.1 From 0b20348321b0c5663e46f293ed0ceb3c68594e63 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 19 Oct 2017 10:35:38 +0200 Subject: Fix clazy-temporary-iterator MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I512ffb927cfa161fc810c846a7b57b02601b14b9 Reviewed-by: Sérgio Martins --- src/xmlpatterns/expr/qexpressionsequence.cpp | 10 +++++----- src/xmlpatterns/functions/qconstructorfunctionsfactory.cpp | 5 +++-- src/xmlpatterns/functions/qfunctionfactorycollection.cpp | 5 +++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/xmlpatterns/expr/qexpressionsequence.cpp b/src/xmlpatterns/expr/qexpressionsequence.cpp index 193e15f..d796de4 100644 --- a/src/xmlpatterns/expr/qexpressionsequence.cpp +++ b/src/xmlpatterns/expr/qexpressionsequence.cpp @@ -46,6 +46,9 @@ #include "qexpressionsequence_p.h" +#include +#include + QT_BEGIN_NAMESPACE using namespace QPatternist; @@ -109,11 +112,8 @@ Expression::Ptr ExpressionSequence::compress(const StaticContext::Ptr &context) else if(Id == IDExpressionSequence) { /* Rewrite "(1, (2, 3), 4)" into "(1, 2, 3, 4)" */ - Expression::List::const_iterator seqIt((*it)->operands().constBegin()); - const Expression::List::const_iterator seqEnd((*it)->operands().constEnd()); - - for(; seqIt != seqEnd; ++seqIt) - result.append(*seqIt); + const auto &operands = (*it)->operands(); + std::copy(operands.cbegin(), operands.cend(), std::back_inserter(result)); } else if (Id == IDLiteralSequence) { /* Rewrite "(1, (2, 3), 4)" into "(1, 2, 3, 4)" */ // Note: LiteralSequence does not use the dynamic context, so we pass in a nullptr. diff --git a/src/xmlpatterns/functions/qconstructorfunctionsfactory.cpp b/src/xmlpatterns/functions/qconstructorfunctionsfactory.cpp index 67c9e84..10d5829 100644 --- a/src/xmlpatterns/functions/qconstructorfunctionsfactory.cpp +++ b/src/xmlpatterns/functions/qconstructorfunctionsfactory.cpp @@ -58,8 +58,9 @@ ConstructorFunctionsFactory::ConstructorFunctionsFactory(const NamePool::Ptr &np { Q_ASSERT(m_typeFactory); Q_ASSERT(np); - SchemaType::Hash::const_iterator it(m_typeFactory->types().constBegin()); - const SchemaType::Hash::const_iterator end(m_typeFactory->types().constEnd()); + const auto &schemaHash = m_typeFactory->types(); + SchemaType::Hash::const_iterator it(schemaHash.constBegin()); + const SchemaType::Hash::const_iterator end(schemaHash.constEnd()); FunctionArgument::List args; const QXmlName argName(StandardNamespaces::empty, StandardLocalNames::sourceValue); diff --git a/src/xmlpatterns/functions/qfunctionfactorycollection.cpp b/src/xmlpatterns/functions/qfunctionfactorycollection.cpp index 6c10425..1deb3cc 100644 --- a/src/xmlpatterns/functions/qfunctionfactorycollection.cpp +++ b/src/xmlpatterns/functions/qfunctionfactorycollection.cpp @@ -92,8 +92,9 @@ FunctionSignature::Hash FunctionFactoryCollection::functionSignatures() const for(const_iterator it(constBegin()); it != e; ++it) { - const FunctionSignature::Hash::const_iterator e2((*it)->functionSignatures().constEnd()); - FunctionSignature::Hash::const_iterator sit((*it)->functionSignatures().constBegin()); + const auto &signatures = (*it)->functionSignatures(); + const FunctionSignature::Hash::const_iterator e2(signatures.constEnd()); + FunctionSignature::Hash::const_iterator sit(signatures.constBegin()); for(; sit != e2; ++sit) result.insert(sit.key(), sit.value()); -- cgit v1.2.1