diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-02-15 12:30:46 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-02-15 12:30:46 +0100 |
| commit | 1f32783be62221b51adf6180c03e1aa9e952df66 (patch) | |
| tree | fa905221734a9fdc5d62acdbd4f9820c40c7e7c5 | |
| parent | 7d6c9224ee85e01e33c30f6b4c6164f90bfdb952 (diff) | |
| parent | 8be09562ea225d6bbec98d813a19816e7e651f53 (diff) | |
Merge remote-tracking branch 'origin/5.10' into 5.11
Change-Id: I2169baef0a8adb5523d2cfe58896199e967ac1b7
| -rw-r--r-- | config.tests/hostcompiler/main.cpp | 28 | ||||
| -rw-r--r-- | tests/auto/quick/quick.pro | 4 |
2 files changed, 30 insertions, 2 deletions
diff --git a/config.tests/hostcompiler/main.cpp b/config.tests/hostcompiler/main.cpp index 96444ae8b..c664a810f 100644 --- a/config.tests/hostcompiler/main.cpp +++ b/config.tests/hostcompiler/main.cpp @@ -1,3 +1,31 @@ +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtWebEngine module 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 <stdio.h> int main() { diff --git a/tests/auto/quick/quick.pro b/tests/auto/quick/quick.pro index e67cf0ed0..56c7d02aa 100644 --- a/tests/auto/quick/quick.pro +++ b/tests/auto/quick/quick.pro @@ -14,5 +14,5 @@ qtConfig(webengine-testsupport) { qquickwebengineviewgraphics } -# QTBUG-60268 -boot2qt: SUBDIRS -= inspectorserver qquickwebenginedefaultsurfaceformat qquickwebengineview +# QTBUG-66055 +boot2qt: SUBDIRS -= inspectorserver qquickwebenginedefaultsurfaceformat qquickwebengineview qmltests |