diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-23 03:00:03 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-23 03:00:03 +0200 |
commit | 90e38c501aedc103dd4d8c1de1526efc6818de98 (patch) | |
tree | 34bca7bb5d48b5389a0e5a57797d51e843a72c0b | |
parent | 43e8d6d6b6a71f34fa8a7ef4683665446ac3047f (diff) | |
parent | 9acfa7d281efceec38ef8e8bdd03376993fd2594 (diff) | |
download | qtscript-90e38c501aedc103dd4d8c1de1526efc6818de98.tar.gz |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ieea89c3b8d092df29750074df133480e1b5d95d4
-rw-r--r-- | dist/changes-5.11.1 | 29 | ||||
-rw-r--r-- | src/script/doc/src/qtscript-index.qdoc | 14 | ||||
-rw-r--r-- | src/scripttools/doc/src/qtscripttools-index.qdoc | 9 | ||||
-rw-r--r-- | tests/auto/compilerwarnings/data/test_cpp.txt | 43 |
4 files changed, 52 insertions, 43 deletions
diff --git a/dist/changes-5.11.1 b/dist/changes-5.11.1 new file mode 100644 index 0000000..42ece52 --- /dev/null +++ b/dist/changes-5.11.1 @@ -0,0 +1,29 @@ +Qt 5.11.1 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.11.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.11 series is binary compatible with the 5.10.x series. +Applications compiled for 5.10 will continue to run with 5.11. + +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.11.1 Changes * +**************************************************************************** + +**************************************************************************** +* QtScript * +**************************************************************************** + + - [QTBUG-68367] Fix incorrect script evaluations on 64-bit systems with + gcc 8. diff --git a/src/script/doc/src/qtscript-index.qdoc b/src/script/doc/src/qtscript-index.qdoc index 064888b..6cf347f 100644 --- a/src/script/doc/src/qtscript-index.qdoc +++ b/src/script/doc/src/qtscript-index.qdoc @@ -35,6 +35,20 @@ \tableofcontents + \section1 Licenses and Attributions + + Qt Script is available under commercial licenses from \l{The Qt Company}. + In addition, it is available under free software licenses. Since Qt 5.4, + these free software licenses are + \l{GNU Lesser General Public License, version 3}, or + the \l{GNU General Public License, version 2}. + See \l{Qt Licensing} for further details. + + Furthermore, Qt Script in Qt \QtVersion does contain third-party + modules under following permissive licenses: + + \generatelist{groupsbymodule attributions-qtscript} + \section1 Scripting Classes The following classes add scripting capabilities to Qt applications. diff --git a/src/scripttools/doc/src/qtscripttools-index.qdoc b/src/scripttools/doc/src/qtscripttools-index.qdoc index 339c8b8..84f09c5 100644 --- a/src/scripttools/doc/src/qtscripttools-index.qdoc +++ b/src/scripttools/doc/src/qtscripttools-index.qdoc @@ -46,6 +46,15 @@ \snippet doc_src_qtscripttools.pro 1 + \section1 Licenses + + Qt Script Tools is available under commercial licenses from \l{The Qt Company}. + In addition, it is available under free software licenses. Since Qt 5.4, + these free software licenses are + \l{GNU Lesser General Public License, version 3}, or + the \l{GNU General Public License, version 2}. + See \l{Qt Licensing} for further details. + \section1 Related Information \section2 Guides diff --git a/tests/auto/compilerwarnings/data/test_cpp.txt b/tests/auto/compilerwarnings/data/test_cpp.txt deleted file mode 100644 index cc32fc3..0000000 --- a/tests/auto/compilerwarnings/data/test_cpp.txt +++ /dev/null @@ -1,43 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2018 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** 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. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -#ifndef QT_NO_SCRIPT -#include <QtScript/QtScript> -#endif - -#ifndef QT_NO_SCRIPTTOOLS -#include <QtScriptTools/QtScriptTools> -#endif - -#ifndef Q_OS_MAC -int main(int, char **) -{ - return 0; -} -#endif |