3 files changed, 11 insertions, 37 deletions
diff --git a/tests/auto/corelib/io/qfile/stdinprocess/CMakeLists.txt b/tests/auto/corelib/io/qfile/stdinprocess/CMakeLists.txt
index eb1f6a0ff0..2a4c2a9615 100644
--- a/tests/auto/corelib/io/qfile/stdinprocess/CMakeLists.txt
+++ b/tests/auto/corelib/io/qfile/stdinprocess/CMakeLists.txt
@@ -1,10 +1,11 @@
-# Generated from stdinprocess.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
 
 #####################################################################
 ## stdinprocess_helper Binary:
 #####################################################################
 
-qt_add_test_helper(stdinprocess_helper
+qt_internal_add_test_helper(stdinprocess_helper
     SOURCES
         main.cpp
 )
diff --git a/tests/auto/corelib/io/qfile/stdinprocess/main.cpp b/tests/auto/corelib/io/qfile/stdinprocess/main.cpp
index 77a1932bd5..0f92ba2670 100644
--- a/tests/auto/corelib/io/qfile/stdinprocess/main.cpp
+++ b/tests/auto/corelib/io/qfile/stdinprocess/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>
@@ -41,13 +16,16 @@ int main(int argc, char *argv[])
     QFile file;
 
     if (strcmp(argv[1], "all") == 0) {
-        file.open(stdin, QFile::ReadWrite);
+        if (!file.open(stdin, QFile::ReadWrite))
+            return 1;
         printf("%s", file.readAll().constData());
     } else if (strcmp(argv[1], "line") == 0) {
         if (strcmp(argv[2], "0") == 0) {
-            file.open(stdin, QFile::ReadWrite);
+            if (!file.open(stdin, QFile::ReadWrite))
+                return 1;
         } else {
-            file.open(0, QFile::ReadWrite);
+            if (!file.open(0, QFile::ReadWrite))
+                return 1;
         }
 
         char line[1024];
diff --git a/tests/auto/corelib/io/qfile/stdinprocess/stdinprocess.pro b/tests/auto/corelib/io/qfile/stdinprocess/stdinprocess.pro
deleted file mode 100644
index bc48a9fb39..0000000000
--- a/tests/auto/corelib/io/qfile/stdinprocess/stdinprocess.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-SOURCES += main.cpp
-QT = core
-
-load(qt_test_helper)
-CONFIG += c++17