diff options
Diffstat (limited to 'tests/auto/corelib/thread/qthreadstorage/crashonexit')
4 files changed, 7 insertions, 65 deletions
diff --git a/tests/auto/corelib/thread/qthreadstorage/crashonexit/.prev_CMakeLists.txt b/tests/auto/corelib/thread/qthreadstorage/crashonexit/.prev_CMakeLists.txt deleted file mode 100644 index 8a8e24587d..0000000000 --- a/tests/auto/corelib/thread/qthreadstorage/crashonexit/.prev_CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -# Generated from crashonexit.pro. - -##################################################################### -## crashonexit Binary: -##################################################################### - -qt_add_executable(crashonexit - OUTPUT_DIRECTORY "${INSTALL_TESTSDIR}/tst_qthreadstorage/crashonexit" - INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qthreadstorage/crashonexit" - SOURCES - crashOnExit.cpp -) - -## Scopes: -##################################################################### diff --git a/tests/auto/corelib/thread/qthreadstorage/crashonexit/CMakeLists.txt b/tests/auto/corelib/thread/qthreadstorage/crashonexit/CMakeLists.txt index 0951c7df53..4d62e61a36 100644 --- a/tests/auto/corelib/thread/qthreadstorage/crashonexit/CMakeLists.txt +++ b/tests/auto/corelib/thread/qthreadstorage/crashonexit/CMakeLists.txt @@ -1,15 +1,13 @@ -# Generated from crashonexit.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## crashonexit Binary: ##################################################################### -qt_add_executable(crashOnExit_helper # special case - OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/.." # special case - INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qthreadstorage/crashOnExit_helper" # special case +qt_internal_add_executable(crashOnExit_helper + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/.." + INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qthreadstorage/crashOnExit_helper" SOURCES crashOnExit.cpp ) - -## Scopes: -##################################################################### diff --git a/tests/auto/corelib/thread/qthreadstorage/crashonexit/crashOnExit.cpp b/tests/auto/corelib/thread/qthreadstorage/crashonexit/crashOnExit.cpp index 5a42156b85..3b3a4d4813 100644 --- a/tests/auto/corelib/thread/qthreadstorage/crashonexit/crashOnExit.cpp +++ b/tests/auto/corelib/thread/qthreadstorage/crashonexit/crashOnExit.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/QThreadStorage> diff --git a/tests/auto/corelib/thread/qthreadstorage/crashonexit/crashonexit.pro b/tests/auto/corelib/thread/qthreadstorage/crashonexit/crashonexit.pro deleted file mode 100644 index 57bd78bcee..0000000000 --- a/tests/auto/corelib/thread/qthreadstorage/crashonexit/crashonexit.pro +++ /dev/null @@ -1,16 +0,0 @@ -SOURCES += crashOnExit.cpp -debug_and_release { - CONFIG(debug, debug|release) { - TARGET = ../../debug/crashOnExit_helper - } else { - TARGET = ../../release/crashOnExit_helper - } -} else { - TARGET = ../crashOnExit_helper -} -QT = core -CONFIG += cmdline - -# This app is testdata for tst_qthreadstorage -target.path = $$[QT_INSTALL_TESTS]/tst_qthreadstorage/$$TARGET -INSTALLS += target |