From 75c40c1799db3ba3919d5288c4f861585dc4a630 Mon Sep 17 00:00:00 2001 From: Sami Nurmenniemi Date: Tue, 30 Jan 2018 09:27:40 +0200 Subject: Disable failing developer build tests for Qemu Task-number: QTBUG-63152 Change-Id: I7016195c43ba308153d4748a6f9837f1772e762d Reviewed-by: Allan Sandfeld Jensen --- tests/auto/quick/quick.pro | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 -- cgit v1.2.3 From 8be09562ea225d6bbec98d813a19816e7e651f53 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Mon, 29 Jan 2018 18:59:31 +0100 Subject: Add license header Add license header to file added in commit f0c5f3306fadc. Change-Id: I4343f74857f8afdca277666a206d08d7a1167bbf Reviewed-by: Michal Klocek --- config.tests/hostcompiler/main.cpp | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) 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 int main() { -- cgit v1.2.3