summaryrefslogtreecommitdiffstats
path: root/tests/auto/render/ddstextures
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/render/ddstextures')
-rw-r--r--tests/auto/render/ddstextures/CMakeLists.txt6
-rw-r--r--tests/auto/render/ddstextures/ddstextures.pro39
-rw-r--r--tests/auto/render/ddstextures/tst_ddstextures.cpp2
3 files changed, 7 insertions, 40 deletions
diff --git a/tests/auto/render/ddstextures/CMakeLists.txt b/tests/auto/render/ddstextures/CMakeLists.txt
index 41edc93be..7f6510aa5 100644
--- a/tests/auto/render/ddstextures/CMakeLists.txt
+++ b/tests/auto/render/ddstextures/CMakeLists.txt
@@ -7,6 +7,12 @@
## tst_ddstextures Test:
#####################################################################
+if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+ cmake_minimum_required(VERSION 3.16)
+ project(tst_ddstextures LANGUAGES CXX)
+ find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST)
+endif()
+
# Collect test data
file(GLOB_RECURSE test_data_glob
RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
diff --git a/tests/auto/render/ddstextures/ddstextures.pro b/tests/auto/render/ddstextures/ddstextures.pro
deleted file mode 100644
index 62456561f..000000000
--- a/tests/auto/render/ddstextures/ddstextures.pro
+++ /dev/null
@@ -1,39 +0,0 @@
-TEMPLATE = app
-
-TARGET = tst_ddstextures
-
-CONFIG += testcase
-
-SOURCES += tst_ddstextures.cpp
-
-OTHER_FILES = \
- data/16x16x1-1-bc1.dds \
- data/16x16x1-1-bc1-dx10.dds \
- data/16x16x1-1-bc1-nomips.dds \
- data/16x16x1-1-bc1-nomips-dx10.dds \
- data/16x16x1-1-bc3.dds \
- data/16x16x1-1-bc3-dx10.dds \
- data/16x16x1-1-bc3-nomips.dds \
- data/16x16x1-1-bc3-nomips-dx10.dds \
- data/16x16x1-1-lumi.dds \
- data/16x16x1-1-lumi-nomips.dds \
- data/16x16x1-1-rgb.dds \
- data/16x16x1-1-rgb-nomips.dds \
- data/16x16x1-6-bc1.dds \
- data/16x16x1-6-bc1-dx10.dds \
- data/16x16x1-6-bc1-nomips.dds \
- data/16x16x1-6-bc1-nomips-dx10.dds \
- data/16x16x1-6-bc3.dds \
- data/16x16x1-6-bc3-dx10.dds \
- data/16x16x1-6-bc3-nomips.dds \
- data/16x16x1-6-bc3-nomips-dx10.dds \
- data/16x16x1-6-lumi.dds \
- data/16x16x1-6-lumi-nomips.dds \
- data/16x16x1-6-rgb.dds \
- data/16x16x1-6-rgb-nomips.dds \
- data/16x16-etc1.pkm \
- data/16x16-etc2.pkm
-
-TESTDATA = data/*
-
-QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib
diff --git a/tests/auto/render/ddstextures/tst_ddstextures.cpp b/tests/auto/render/ddstextures/tst_ddstextures.cpp
index d689c13e0..884eb6e7b 100644
--- a/tests/auto/render/ddstextures/tst_ddstextures.cpp
+++ b/tests/auto/render/ddstextures/tst_ddstextures.cpp
@@ -1,5 +1,5 @@
// Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB).
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
// TODO Remove in Qt6
#include <QtCore/qcompilerdetection.h>