diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-23 03:01:34 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-23 03:01:34 +0200 |
commit | 3d3544f85a8d0835f9fcc2b62800c278cc42ebfe (patch) | |
tree | 01a4f58be52e4d225f46ff44cafed96912f7bb06 | |
parent | 167197d7f9145c1c05543b24f18c9fd909cd90c5 (diff) | |
parent | 59c8f354644b6016c6e0ac45e60d821544c6d4d2 (diff) | |
download | qtsvg-3d3544f85a8d0835f9fcc2b62800c278cc42ebfe.tar.gz |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I1d939396e8dbc3d08cc6f1b0817619c3abb60ede
-rw-r--r-- | dist/changes-5.11.1 | 24 | ||||
-rw-r--r-- | tests/auto/compilerwarnings/data/test_cpp.txt | 39 |
2 files changed, 24 insertions, 39 deletions
diff --git a/dist/changes-5.11.1 b/dist/changes-5.11.1 new file mode 100644 index 0000000..030ea3f --- /dev/null +++ b/dist/changes-5.11.1 @@ -0,0 +1,24 @@ +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 * +**************************************************************************** + + - This release contains only minor code improvements. diff --git a/tests/auto/compilerwarnings/data/test_cpp.txt b/tests/auto/compilerwarnings/data/test_cpp.txt deleted file mode 100644 index bf8c56e..0000000 --- a/tests/auto/compilerwarnings/data/test_cpp.txt +++ /dev/null @@ -1,39 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 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_SVG -#include <QtSvg/QtSvg> -#endif - -#ifndef Q_OS_MAC -int main(int, char **) -{ - return 0; -} -#endif |