diff options
Diffstat (limited to 'examples/qt3d/3d-text')
-rw-r--r-- | examples/qt3d/3d-text/CMakeLists.txt | 2 | ||||
-rw-r--r-- | examples/qt3d/3d-text/main.cpp | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/examples/qt3d/3d-text/CMakeLists.txt b/examples/qt3d/3d-text/CMakeLists.txt index fd059858d..f650a5375 100644 --- a/examples/qt3d/3d-text/CMakeLists.txt +++ b/examples/qt3d/3d-text/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause cmake_minimum_required(VERSION 3.16) project(3d-text LANGUAGES CXX) diff --git a/examples/qt3d/3d-text/main.cpp b/examples/qt3d/3d-text/main.cpp index 4967958aa..9aa44ba60 100644 --- a/examples/qt3d/3d-text/main.cpp +++ b/examples/qt3d/3d-text/main.cpp @@ -34,11 +34,7 @@ int main(int argc, char *argv[]) auto *textMaterial = new Qt3DExtras::QPhongMaterial(root); { // text int i = 0; -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) const QStringList fonts = QFontDatabase::families(); -#else - const QStringList fonts = QFontDatabase().families(); -#endif for (const QString &family : fonts) { |