Merge remote-tracking branch 'origin/5.11' into dev

 Conflicts:
	src/androiddeployqt/main.cpp

Change-Id: I3df907e197b1b976f74562f1a9cce10261f166f3

1 files changed, 0 insertions, 39 deletions

diff --git a/tests/auto/compilerwarnings/data/test_cpp.txt b/tests/auto/compilerwarnings/data/test_cpp.txt
deleted file mode 100644
index f54971239..000000000
--- a/tests/auto/compilerwarnings/data/test_cpp.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd and/or its subsidiary(-ies).
-** 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$
-**
-****************************************************************************/
-
-
-#include <QtDesigner/QtDesigner>
-#include <QtHelp/QtHelp>
-//#include <QtCLucene/QtCLucene>
-
-#ifndef Q_OS_MAC
-int main(int, char **)
-{
-    return 0;
-}
-#endif