diff options
Diffstat (limited to 'tests/auto/testlib/selftests/findtestdata')
5 files changed, 15 insertions, 83 deletions
diff --git a/tests/auto/testlib/selftests/findtestdata/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/findtestdata/.prev_CMakeLists.txt deleted file mode 100644 index 768abb6824..0000000000 --- a/tests/auto/testlib/selftests/findtestdata/.prev_CMakeLists.txt +++ /dev/null @@ -1,28 +0,0 @@ -# Generated from findtestdata.pro. - -##################################################################### -## findtestdata Binary: -##################################################################### - -qt_add_executable(findtestdata - SOURCES - findtestdata.cpp - PUBLIC_LIBRARIES - Qt::Test -) - -# Resources: -set(findtestdata_resource_files - "qt.conf" -) - -qt_add_resource(findtestdata "findtestdata" - PREFIX - "/qt/etc/" - FILES - ${findtestdata_resource_files} -) - - -## Scopes: -##################################################################### diff --git a/tests/auto/testlib/selftests/findtestdata/CMakeLists.txt b/tests/auto/testlib/selftests/findtestdata/CMakeLists.txt index 2a3302fb3e..9422861e22 100644 --- a/tests/auto/testlib/selftests/findtestdata/CMakeLists.txt +++ b/tests/auto/testlib/selftests/findtestdata/CMakeLists.txt @@ -1,15 +1,17 @@ -# Generated from findtestdata.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## findtestdata Binary: ##################################################################### -qt_add_executable(findtestdata - NO_INSTALL # special case - OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case +qt_internal_add_executable(findtestdata + NO_INSTALL + EXCEPTIONS + OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} SOURCES findtestdata.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::Test ) @@ -18,7 +20,7 @@ set(findtestdata_resource_files "qt.conf" ) -qt_add_resource(findtestdata "findtestdata" +qt_internal_add_resource(findtestdata "findtestdata" PREFIX "/qt/etc/" FILES @@ -29,6 +31,4 @@ qt_add_resource(findtestdata "findtestdata" ## Scopes: ##################################################################### -# special case begin -qt_apply_testlib_coverage_options(findtestdata) -# special case end +qt_internal_apply_testlib_coverage_options(findtestdata) diff --git a/tests/auto/testlib/selftests/findtestdata/findtestdata.cpp b/tests/auto/testlib/selftests/findtestdata/findtestdata.cpp index cccb0023dc..9b74ffd3a6 100644 --- a/tests/auto/testlib/selftests/findtestdata/findtestdata.cpp +++ b/tests/auto/testlib/selftests/findtestdata/findtestdata.cpp @@ -1,34 +1,10 @@ -/**************************************************************************** -** -** 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 <QtTest/QtTest> +#include <QTest> +#include <QLibraryInfo> #define TESTFILE "testfile" @@ -50,7 +26,7 @@ void FindTestData::initTestCase() // verify that our qt.conf is working as expected. QString app_path = QCoreApplication::applicationDirPath(); QString install_path = app_path -#ifdef Q_OS_MAC +#ifdef Q_OS_DARWIN + "/Contents" #endif + "/tests"; @@ -99,7 +75,7 @@ void FindTestData::paths() // 2. at the test install path (faked via qt.conf) QString testfile_path2 = app_path -#ifdef Q_OS_MAC +#ifdef Q_OS_DARWIN + "/Contents" #endif + "/tests/findtestdata/" TESTFILE; diff --git a/tests/auto/testlib/selftests/findtestdata/findtestdata.pro b/tests/auto/testlib/selftests/findtestdata/findtestdata.pro deleted file mode 100644 index 7fbdaea3a3..0000000000 --- a/tests/auto/testlib/selftests/findtestdata/findtestdata.pro +++ /dev/null @@ -1,11 +0,0 @@ -SOURCES += findtestdata.cpp -QT = core testlib - -mac:CONFIG -= app_bundle -CONFIG -= debug_and_release_target - -RESOURCES = findtestdata.qrc - -TARGET = findtestdata - -include($$QT_SOURCE_TREE/src/testlib/selfcover.pri) diff --git a/tests/auto/testlib/selftests/findtestdata/findtestdata.qrc b/tests/auto/testlib/selftests/findtestdata/findtestdata.qrc deleted file mode 100644 index cb3eee30d2..0000000000 --- a/tests/auto/testlib/selftests/findtestdata/findtestdata.qrc +++ /dev/null @@ -1,5 +0,0 @@ -<RCC> - <qresource prefix="/qt/etc/" > - <file>qt.conf</file> - </qresource> -</RCC> |