qiurui
/
qtdoc
mirror of https://github.com/qt/qtdoc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Thermostat, TODO List: Remove unused QDS components 

The QDS components are built by default, which generates a lot of
warnings by qmlsc, and also creates issues on Windows due to
too long paths. But they are not used, so we might as well remove
them from the examples.

Pick-to: 6.5.2 6.5 6.6
Change-Id: Ie932b05c88f07793a95e4980cb4f63aa0a58229e
Reviewed-by: <kaj@spyro-soft.com>
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
This commit is contained in:
Kai Köhne 2023-06-20 12:47:59 +02:00
parent e4d17474a2
commit 1ac93ad9ca
5 changed files with 0 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
examples/demos/thermostat/CMakeLists.txt
View File

@ -3,7 +3,6 @@
cmake_minimum_required(VERSION 3.16)
set(BUILD_QDS_COMPONENTS ON CACHE BOOL "Build design studio components")
set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/demos/thermostat")
project(ThermostatApp LANGUAGES CXX)
@ -20,10 +19,6 @@ qt_add_resources(ThermostatApp "configuration"
qtquickcontrols2.conf
)
if (${BUILD_QDS_COMPONENTS})
include(qmlcomponents)
endif ()
include(qmlmodules)
target_link_libraries(ThermostatApp PRIVATE

33
examples/demos/thermostat/qmlcomponents
View File

@ -1,33 +0,0 @@
# Copyright (C) 2023 The Qt Company Ltd.
# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
message("Building designer components.")
set(QT_QML_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/qml")
include(FetchContent)
FetchContent_Declare(
ds
GIT_TAG qds-4.1
GIT_REPOSITORY https://code.qt.io/qt-labs/qtquickdesigner-components.git
)
FetchContent_GetProperties(ds)
FetchContent_Populate(ds)
target_link_libraries(ThermostatApp PRIVATE
QuickStudioComponentsplugin
QuickStudioEffectsplugin
QuickStudioApplicationplugin
FlowViewplugin
QuickStudioLogicHelperplugin
QuickStudioMultiTextplugin
QuickStudioEventSimulatorplugin
QuickStudioEventSystemplugin
)
add_subdirectory(${ds_SOURCE_DIR} ${ds_BINARY_DIR})
target_compile_definitions(ThermostatApp PRIVATE
BULD_QDS_COMPONENTS=true
)

17
examples/demos/thermostat/src/import_qml_components_plugins.h
View File

@ -1,17 +0,0 @@
// Copyright (C) 2023 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
#include "qqmlextensionplugin.h"
#ifdef BULD_QDS_COMPONENTS
Q_IMPORT_QML_PLUGIN(QtQuick_Studio_ComponentsPlugin)
Q_IMPORT_QML_PLUGIN(QtQuick_Studio_EffectsPlugin)
Q_IMPORT_QML_PLUGIN(QtQuick_Studio_ApplicationPlugin)
Q_IMPORT_QML_PLUGIN(FlowViewPlugin)
Q_IMPORT_QML_PLUGIN(QtQuick_Studio_LogicHelperPlugin)
Q_IMPORT_QML_PLUGIN(QtQuick_Studio_MultiTextPlugin)
Q_IMPORT_QML_PLUGIN(QtQuick_Studio_EventSimulatorPlugin)
Q_IMPORT_QML_PLUGIN(QtQuick_Studio_EventSystemPlugin)
#endif

4
examples/demos/todolist/CMakeLists.txt
View File

@ -19,10 +19,6 @@ qt_add_resources(ToDoListApp "configuration"
qtquickcontrols2.conf
)
if (${BUILD_QDS_COMPONENTS})
include(qmlcomponents.cmake)
endif ()
include(qmlmodules.cmake)
target_link_libraries(ToDoListApp PRIVATE

33
examples/demos/todolist/qmlcomponents.cmake
View File

@ -1,33 +0,0 @@
#Copyright (C) 2023 The Qt Company Ltd.
#SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
message("Building designer components.")
set(QT_QML_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/qml")
include(FetchContent)
FetchContent_Declare(
ds
GIT_TAG qds-3.9
GIT_REPOSITORY https://code.qt.io/qt-labs/qtquickdesigner-components.git
)
FetchContent_GetProperties(ds)
FetchContent_Populate(ds)
target_link_libraries(ToDoListApp PRIVATE
QuickStudioComponentsplugin
QuickStudioEffectsplugin
QuickStudioApplicationplugin
FlowViewplugin
QuickStudioLogicHelperplugin
QuickStudioMultiTextplugin
QuickStudioEventSimulatorplugin
QuickStudioEventSystemplugin
)
add_subdirectory(${ds_SOURCE_DIR} ${ds_BINARY_DIR})
target_compile_definitions(ToDoListApp PRIVATE
BULD_QDS_COMPONENTS=true
)