diff options
Diffstat (limited to 'tests/auto/corelib/serialization/qxmlstream/setupSuite.sh')
| -rwxr-xr-x | tests/auto/corelib/serialization/qxmlstream/setupSuite.sh | 33 |
1 files changed, 3 insertions, 30 deletions
diff --git a/tests/auto/corelib/serialization/qxmlstream/setupSuite.sh b/tests/auto/corelib/serialization/qxmlstream/setupSuite.sh index 8dc9b7d551..3cf842c32a 100755 --- a/tests/auto/corelib/serialization/qxmlstream/setupSuite.sh +++ b/tests/auto/corelib/serialization/qxmlstream/setupSuite.sh @@ -1,31 +1,6 @@ #!/bin/sh -############################################################################# -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is the build configuration utility 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$ -## -############################################################################# +# Copyright (C) 2016 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 # # Hello! @@ -42,7 +17,5 @@ cd XML-Test-Suite export CVSROOT=":pserver:anonymous@dev.w3.org:/sources/public" cvs -q up -C -p4 edit ... -p4 revert `find -name "Entries"` # They only contain CVS timestamps. +git checkout -- `find -name "Entries"` # They only contain CVS timestamps. xmllint --valid --noent xmlconf/xmlconf.xml --output xmlconf/finalCatalog.xml -p4 revert -a ... |