diff options
Diffstat (limited to 'tests/auto/corelib/io/qprocess/testForwarding')
3 files changed, 7 insertions, 33 deletions
diff --git a/tests/auto/corelib/io/qprocess/testForwarding/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testForwarding/CMakeLists.txt index 914785178c..77739d2c68 100644 --- a/tests/auto/corelib/io/qprocess/testForwarding/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testForwarding/CMakeLists.txt @@ -1,4 +1,5 @@ -# Generated from testForwarding.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## testForwarding Binary: @@ -9,3 +10,5 @@ qt_internal_add_executable(testForwarding SOURCES main.cpp ) + +add_dependencies(testForwarding testForwardingHelper) diff --git a/tests/auto/corelib/io/qprocess/testForwarding/main.cpp b/tests/auto/corelib/io/qprocess/testForwarding/main.cpp index b5d56a1138..774a8622e1 100644 --- a/tests/auto/corelib/io/qprocess/testForwarding/main.cpp +++ b/tests/auto/corelib/io/qprocess/testForwarding/main.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** 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$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtCore/QCoreApplication> #include <QtCore/QDeadlineTimer> @@ -38,7 +13,7 @@ static bool waitForDoneFileWritten(const QString &filePath, int msecs = 30000) { QDeadlineTimer t(msecs); do { - QThread::msleep(250); + QThread::sleep(std::chrono::milliseconds{250}); QFile file(filePath); if (!file.open(QIODevice::ReadOnly)) continue; diff --git a/tests/auto/corelib/io/qprocess/testForwarding/testForwarding.pro b/tests/auto/corelib/io/qprocess/testForwarding/testForwarding.pro deleted file mode 100644 index 4d91e0cf36..0000000000 --- a/tests/auto/corelib/io/qprocess/testForwarding/testForwarding.pro +++ /dev/null @@ -1,4 +0,0 @@ -SOURCES = main.cpp -CONFIG += cmdline -DESTDIR = ./ -QT = core |