diff options
Diffstat (limited to 'examples/quick/rendercontrol/rendercontrol_d3d11')
3 files changed, 15 insertions, 28 deletions
diff --git a/examples/quick/rendercontrol/rendercontrol_d3d11/CMakeLists.txt b/examples/quick/rendercontrol/rendercontrol_d3d11/CMakeLists.txt index 98da6e317d..1851fba31d 100644 --- a/examples/quick/rendercontrol/rendercontrol_d3d11/CMakeLists.txt +++ b/examples/quick/rendercontrol/rendercontrol_d3d11/CMakeLists.txt @@ -6,8 +6,6 @@ project(rendercontrol_d3d11 LANGUAGES CXX) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) -set(CMAKE_AUTOUIC ON) if(NOT DEFINED INSTALL_EXAMPLESDIR) set(INSTALL_EXAMPLESDIR "examples") @@ -15,21 +13,14 @@ endif() set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/rendercontrol/rendercontrol_d3d11") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Quick) -find_package(Qt6 COMPONENTS Qml) +find_package(Qt6 COMPONENTS Core Gui Quick Qml) -qt_add_executable(rendercontrol_d3d11 - engine.cpp engine.h +qt_add_executable(rendercontrol_d3d11example WIN32 MACOSX_BUNDLE + engine.cpp main.cpp - window.cpp window.h + window.cpp ) -set_target_properties(rendercontrol_d3d11 PROPERTIES - WIN32_EXECUTABLE TRUE - MACOSX_BUNDLE TRUE -) -target_link_libraries(rendercontrol_d3d11 PUBLIC +target_link_libraries(rendercontrol_d3d11example PUBLIC Qt::Core Qt::Gui Qt::Qml @@ -42,18 +33,14 @@ target_link_libraries(rendercontrol_d3d11 PUBLIC # Resources: -set(rendercontrol_resource_files - "demo.qml" -) - -qt6_add_resources(rendercontrol_d3d11 "rendercontrol" - PREFIX - "/rendercontrol" - FILES - ${rendercontrol_resource_files} +qt_add_qml_module(rendercontrol_d3d11example + URI rendercontrol + VERSION 1.0 + QML_FILES + "demo.qml" ) -install(TARGETS rendercontrol_d3d11 +install(TARGETS rendercontrol_d3d11example RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/quick/rendercontrol/rendercontrol_d3d11/demo.qml b/examples/quick/rendercontrol/rendercontrol_d3d11/demo.qml index 32e2f423d1..d724d6304b 100644 --- a/examples/quick/rendercontrol/rendercontrol_d3d11/demo.qml +++ b/examples/quick/rendercontrol/rendercontrol_d3d11/demo.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2021 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Particles 2.0 +import QtQuick +import QtQuick.Particles Rectangle { id: root diff --git a/examples/quick/rendercontrol/rendercontrol_d3d11/main.cpp b/examples/quick/rendercontrol/rendercontrol_d3d11/main.cpp index 119b289500..defb080a91 100644 --- a/examples/quick/rendercontrol/rendercontrol_d3d11/main.cpp +++ b/examples/quick/rendercontrol/rendercontrol_d3d11/main.cpp @@ -64,7 +64,7 @@ int main(int argc, char **argv) QCoreApplication::setApplicationVersion(QT_VERSION_STR); // only functional when Qt Quick is also using D3D11 - QQuickWindow::setGraphicsApi(QSGRendererInterface::Direct3D11Rhi); + QQuickWindow::setGraphicsApi(QSGRendererInterface::Direct3D11); Engine engine; if (!engine.create()) |