CaROS/meta-qt6
3
0
Fork 0
mirror of http://code.qt.io/yocto/meta-qt6.git synced 2026-01-01 13:58:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update modules

Browse Source 
The cross-complilation support for tools was merged, remove obsolete
patch. Regenerate cmake files for modules affected by it.
This commit is contained in:
Samuli Piippo 2020-06-04 12:55:16 +03:00
parent be8a586c85
commit 3d8922e368
16 changed files with 1500 additions and 301 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

292
recipes-qt/qt6/qtbase/0001-WIP-Build-Tools-when-cross-compiling.patch
View File

@ -1,292 +0,0 @@
From 2cc488056f719e8f4e90bae6247c3739fb185e4b Mon Sep 17 00:00:00 2001
From: Leander Beernaert <leander.beernaert@qt.io>
Date: Mon, 27 Apr 2020 15:04:57 +0200
Subject: [PATCH] WIP: Build Tools when cross compiling
This patch allows tools to be built for the target platform when the
QT_BUILD_TOOLS_WHEN_CROSSCOMPILING parameter is set at configuration
time or before an invocation of qt_add_tool().
To avoid naming conflicts the target tools are suffixed with the
'_native' string. The qt_get_tool_target_name() function can be used to
get the tool name for both scenarios (cross and non-cross compilation).
Every tool now has the property QT_IS_TOOL set to true.
qt_extand_target() has also been updated to check whether the target in
question is a tool and whether we allow tools to be built during cross
compilation before aborting.
Fixes: QTBUG-81901
Change-Id: If4efbc1fae07a4a3a044dd09c9c06be6d517825e
---
cmake/QtBaseGlobalTargets.cmake | 5 +++
cmake/QtBuild.cmake | 67 +++++++++++++++++++++++------
cmake/QtModuleDependencies.cmake.in | 16 +++++++
cmake/QtSetup.cmake | 2 +-
qmake/CMakeLists.txt | 11 +++--
5 files changed, 82 insertions(+), 19 deletions(-)
diff --git a/cmake/QtBaseGlobalTargets.cmake b/cmake/QtBaseGlobalTargets.cmake
index e5006f0e20..e092d5beb7 100644
--- a/cmake/QtBaseGlobalTargets.cmake
+++ b/cmake/QtBaseGlobalTargets.cmake
@@ -115,6 +115,10 @@ if(QT_HOST_PATH)
set(init_qt_host_path "set(QT_HOST_PATH \"${init_qt_host_path}\" CACHE PATH \"\" FORCE)")
endif()
+if (CMAKE_CROSSCOMPILING AND QT_BUILD_TOOLS_WHEN_CROSSCOMPILING)
+ list(APPEND init_qt_host_path "set(QT_BUILD_TOOLS_WHEN_CROSSCOMPILING \"TRUE\" CACHE BOOL \"\" FORCE)")
+endif()
+
if(CMAKE_TOOLCHAIN_FILE)
set(init_original_toolchain_file "set(qt_chainload_toolchain_file \"${CMAKE_TOOLCHAIN_FILE}\")")
endif()
@@ -166,6 +170,7 @@ endif()
string(REPLACE ";" "\n" init_vcpkg "${init_vcpkg}")
string(REPLACE ";" "\n" init_platform "${init_platform}")
+string(REPLACE ";" "\n" init_qt_host_path "${init_qt_host_path}")
string(REPLACE "LITERAL_SEMICOLON" ";" init_platform "${init_platform}")
qt_compute_relative_path_from_cmake_config_dir_to_prefix()
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/qt.toolchain.cmake.in" "${__GlobalConfig_build_dir}/qt.toolchain.cmake" @ONLY)
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake
index 4c37e1d4b1..e6aa8459a2 100644
--- a/cmake/QtBuild.cmake
+++ b/cmake/QtBuild.cmake
@@ -1324,9 +1324,20 @@ function(qt_extend_target target)
# Don't try to extend_target when cross compiling an imported host target (like a tool).
qt_is_imported_target("${target}" is_imported)
if(is_imported)
- return()
+ qt_get_tool_target_name(tool_target ${target})
+ if (TARGET ${tool_target})
+ get_target_property(is_tool_target ${tool_target} QT_IS_TOOL)
+ if (NOT (CMAKE_CROSSCOMPILING AND QT_BUILD_TOOLS_WHEN_CROSSCOMPILING AND is_tool_target))
+ return()
+ else()
+ set(target ${tool_target})
+ endif()
+ else()
+ return()
+ endif()
endif()
+
if (NOT TARGET "${target}")
message(FATAL_ERROR "Trying to extend non-existing target \"${target}\".")
endif()
@@ -2553,7 +2564,7 @@ function(qt_export_tools module_name)
# If no tools were defined belonging to this module, don't create a config and targets file.
# Guards against the case when doing a cross-build.
- if(NOT "${module_name}" IN_LIST QT_KNOWN_MODULES_WITH_TOOLS OR CMAKE_CROSSCOMPILING)
+ if(NOT "${module_name}" IN_LIST QT_KNOWN_MODULES_WITH_TOOLS OR (CMAKE_CROSSCOMPILING AND NOT QT_BUILD_TOOLS_WHEN_CROSSCOMPILING))
return()
endif()
@@ -2582,6 +2593,9 @@ function(qt_export_tools module_name)
list(APPEND package_deps "${extra_packages}")
endif()
+ if (CMAKE_CROSSCOMPILING AND QT_BUILD_TOOLS_WHEN_CROSSCOMPILING)
+ string(REGEX REPLACE "_native$" "" tool_name ${tool_name})
+ endif()
set(extra_cmake_statements "${extra_cmake_statements}
if (NOT QT_NO_CREATE_TARGETS)
get_property(is_global TARGET ${INSTALL_CMAKE_NAMESPACE}::${tool_name} PROPERTY IMPORTED_GLOBAL)
@@ -3075,7 +3089,7 @@ function(qt_add_executable name)
set(arg_INSTALL_DIRECTORY "${INSTALL_BINDIR}")
endif()
- if (ANDROID)
+ if (FALSE)
add_library("${name}" MODULE)
qt_android_apply_arch_suffix("${name}")
qt_android_generate_deployment_settings("${name}")
@@ -3491,7 +3505,7 @@ endfunction()
# Sets QT_WILL_BUILD_TOOLS if tools will be built.
function(qt_check_if_tools_will_be_built)
- if(NOT CMAKE_CROSSCOMPILING AND NOT QT_FORCE_FIND_TOOLS)
+ if((NOT CMAKE_CROSSCOMPILING AND NOT QT_FORCE_FIND_TOOLS) OR QT_BUILD_TOOLS_WHEN_CROSSCOMPILING)
set(will_build_tools TRUE)
else()
set(will_build_tools FALSE)
@@ -3768,6 +3782,16 @@ function(qt_get_main_cmake_configuration out_var)
set("${out_var}" "${config}" PARENT_SCOPE)
endfunction()
+
+function(qt_get_tool_target_name output_name name)
+ if (CMAKE_CROSSCOMPILING AND QT_BUILD_TOOLS_WHEN_CROSSCOMPILING)
+ set(${output_name} ${name}_native PARENT_SCOPE)
+ else()
+ set(${output_name} ${name} PARENT_SCOPE)
+ endif()
+endfunction()
+
+
# This function is used to define a "Qt tool", such as moc, uic or rcc.
# The BOOTSTRAP option allows building it as standalone program, otherwise
# it will be linked against QtCore.
@@ -3788,10 +3812,14 @@ function(qt_add_tool name)
if(TARGET ${full_name})
get_property(path TARGET ${full_name} PROPERTY LOCATION)
message(STATUS "Tool '${full_name}' was found at ${path}.")
- return()
+ if (CMAKE_CROSSCOMPILING AND NOT QT_BUILD_TOOLS_WHEN_CROSSCOMPILING)
+ return()
+ endif()
endif()
- if(arg_TOOLS_TARGET AND NOT QT_WILL_BUILD_TOOLS)
+ qt_get_tool_target_name(target_name ${name})
+
+ if(arg_TOOLS_TARGET AND (NOT QT_WILL_BUILD_TOOLS OR QT_BUILD_TOOLS_WHEN_CROSSCOMPILING))
set(tools_package_name "Qt6${arg_TOOLS_TARGET}Tools")
message(STATUS "Searching for tool '${full_name}' in package ${tools_package_name}.")
@@ -3827,7 +3855,9 @@ function(qt_add_tool name)
qt_internal_append_known_modules_with_tools("${arg_TOOLS_TARGET}")
get_property(path TARGET ${full_name} PROPERTY LOCATION)
message(STATUS "${full_name} was found at ${path} using package ${tools_package_name}.")
- return()
+ if (NOT QT_BUILD_TOOLS_WHEN_CROSSCOMPILING)
+ return()
+ endif()
endif()
endif()
@@ -3870,7 +3900,7 @@ function(qt_add_tool name)
set(no_install NO_INSTALL)
endif()
- qt_add_executable("${name}" OUTPUT_DIRECTORY "${QT_BUILD_DIR}/${INSTALL_BINDIR}"
+ qt_add_executable("${target_name}" OUTPUT_DIRECTORY "${QT_BUILD_DIR}/${INSTALL_BINDIR}"
${bootstrap}
${no_qt}
${no_install}
@@ -3890,12 +3920,21 @@ function(qt_add_tool name)
TARGET_COMPANY "${arg_TARGET_COMPANY}"
TARGET_COPYRIGHT "${arg_TARGET_COPYRIGHT}"
)
- qt_internal_add_target_aliases("${name}")
+ qt_internal_add_target_aliases("${target_name}")
+
+ if (NOT target_name STREQUAL name)
+ set_target_properties(${target_name} PROPERTIES
+ OUTPUT_NAME ${name}
+ EXPORT_NAME ${name}
+ )
+ endif()
+
+ set_target_properties(${target_name} PROPERTIES QT_IS_TOOL TRUE)
# If building with a multi-config configuration, the main configuration tool will be placed in
# ./bin, while the rest will be in <CONFIG> specific subdirectories.
qt_get_tool_cmake_configuration(tool_cmake_configuration)
- set_target_properties("${name}" PROPERTIES
+ set_target_properties("${target_name}" PROPERTIES
RUNTIME_OUTPUT_DIRECTORY_${tool_cmake_configuration} "${QT_BUILD_DIR}/${INSTALL_BINDIR}"
)
@@ -3904,17 +3943,17 @@ function(qt_add_tool name)
qt_internal_append_known_modules_with_tools("${arg_TOOLS_TARGET}")
# Also append the tool to the module list.
- qt_internal_append_known_module_tool("${arg_TOOLS_TARGET}" "${name}")
+ qt_internal_append_known_module_tool("${arg_TOOLS_TARGET}" "${target_name}")
- qt_install(TARGETS "${name}"
+ qt_install(TARGETS "${target_name}"
EXPORT "${INSTALL_CMAKE_NAMESPACE}${arg_TOOLS_TARGET}ToolsTargets"
DESTINATION ${INSTALL_TARGETS_DEFAULT_ARGS})
- qt_apply_rpaths(TARGET "${name}" INSTALL_PATH "${INSTALL_BINDIR}" RELATIVE_RPATH)
+ qt_apply_rpaths(TARGET "${target_name}" INSTALL_PATH "${INSTALL_BINDIR}" RELATIVE_RPATH)
endif()
if(QT_FEATURE_separate_debug_info AND (UNIX OR MINGW))
- qt_enable_separate_debug_info(${name} ${INSTALL_BINDIR})
+ qt_enable_separate_debug_info(${target_name} ${INSTALL_BINDIR})
endif()
endfunction()
diff --git a/cmake/QtModuleDependencies.cmake.in b/cmake/QtModuleDependencies.cmake.in
index ffb9e8a5d3..4cc8308ff2 100644
--- a/cmake/QtModuleDependencies.cmake.in
+++ b/cmake/QtModuleDependencies.cmake.in
@@ -31,6 +31,14 @@ set(_tool_deps "@main_module_tool_deps@")
set(BACKUP_CMAKE_SIZEOF_VOID_P "${CMAKE_SIZEOF_VOID_P}")
set(CMAKE_SIZEOF_VOID_P "")
+if(QT_HOST_PATH)
+ # Make sure that the tools find the host tools first
+ set(BACKUP_CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH})
+ set(BACKUP_CMAKE_FIND_ROOT_PATH ${CMAKE_FIND_ROOT_PATH})
+ list(PREPEND CMAKE_PREFIX_PATH "${QT_HOST_PATH}")
+ list(PREPEND CMAKE_FIND_ROOT_PATH "${QT_HOST_PATH}")
+endif()
+
foreach(_target_dep ${_tool_deps})
list(GET _target_dep 0 pkg)
list(GET _target_dep 1 version)
@@ -40,9 +48,17 @@ foreach(_target_dep ${_tool_deps})
if (NOT ${pkg}_FOUND)
set(@INSTALL_CMAKE_NAMESPACE@@target@_FOUND FALSE)
set(CMAKE_SIZEOF_VOID_P "${BACKUP_CMAKE_SIZEOF_VOID_P}")
+ if(QT_HOST_PATH)
+ set(CMAKE_PREFIX_PATH ${BACKUP_CMAKE_PREFIX_PATH})
+ set(CMAKE_FIND_ROOT_PATH ${BACKUP_CMAKE_FIND_ROOT_PATH})
+ endif()
return()
endif()
endforeach()
+if(QT_HOST_PATH)
+ set(CMAKE_PREFIX_PATH ${BACKUP_CMAKE_PREFIX_PATH})
+ set(CMAKE_FIND_ROOT_PATH ${BACKUP_CMAKE_FIND_ROOT_PATH})
+endif()
set(CMAKE_SIZEOF_VOID_P "${BACKUP_CMAKE_SIZEOF_VOID_P}")
# note: target_deps example: "Qt6Core\;5.12.0;Qt6Gui\;5.12.0"
diff --git a/cmake/QtSetup.cmake b/cmake/QtSetup.cmake
index 39142fa332..5ff639c17e 100644
--- a/cmake/QtSetup.cmake
+++ b/cmake/QtSetup.cmake
@@ -126,7 +126,7 @@ option(QT_NO_MAKE_TESTS "Should tests be built as part of the default 'all' targ
# Like in qttools/assistant/assistant.pro, load(qt_app), which is guarded by a qtNomakeTools() call.
option(QT_NO_MAKE_TOOLS "Should tools be built as part of the default 'all' target."
- "${CMAKE_CROSSCOMPILING}")
+ "${CMAKE_CROSSCOMPILING} AND NOT ${QT_BUILD_TOOLS_WHEN_CROSSCOMPILING}")
include(CTest)
enable_testing()
diff --git a/qmake/CMakeLists.txt b/qmake/CMakeLists.txt
index fa7d50f234..f0d4473ebe 100644
--- a/qmake/CMakeLists.txt
+++ b/qmake/CMakeLists.txt
@@ -246,15 +246,18 @@ qt_extend_target(qmake CONDITION CLANG AND WIN32
"-Wno-microsoft-enum-value"
)
+# special case begin
+qt_get_tool_target_name(target_name qmake)
# special case:
-set_target_properties(qmake PROPERTIES
+set_target_properties(${target_name} PROPERTIES
AUTOMOC OFF
AUTORCC OFF
AUTOUIC OFF
)
-qt_internal_add_link_flags_gc_sections(qmake PRIVATE) # special case
+qt_internal_add_link_flags_gc_sections(${target_name} PRIVATE) # special case
-qt_enable_msvc_cplusplus_define(qmake PUBLIC) # special case
-qt_skip_warnings_are_errors(qmake) # special case
+qt_enable_msvc_cplusplus_define(${target_name} PUBLIC) # special case
+qt_skip_warnings_are_errors(${target_name}) # special case
+# special case end

3
recipes-qt/qt6/qtbase_git.bb
View File

@ -19,7 +19,6 @@ SRC_URI += "\
file://0003-Sysrootify-qmake.patch \
file://0004-qtbase-allow-paths-outside-of-prefix.patch \
file://0005-Allow-build-without-opengl.patch \
file://0001-WIP-Build-Tools-when-cross-compiling.patch \
"
DEPENDS += "\
@ -142,4 +141,4 @@ FILES_${PN}-tools += "\
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "794150e5bda0c203a5373c3fa2f9785f9941f6dd"
SRCREV = "654a3ad08e52dd84dac3a729e06458cfa568f6bb"

633
recipes-qt/qt6/qtdeclarative/0001-Regenerate-CMakeLists.patch Normal file
View File

@ -0,0 +1,633 @@
From 07374265dc823ee685391574343ef904ca715c4d Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Mon, 1 Jun 2020 16:42:25 +0300
Subject: [PATCH] Regenerate CMakeLists
Change-Id: I8f4ee233cffa32766c434f0e7240e58fe028f153
---
src/qmltyperegistrar/.prev_CMakeLists.txt | 3 ++-
src/qmltyperegistrar/CMakeLists.txt | 3 ++-
tools/qml/.prev_CMakeLists.txt | 16 +++++++++-------
tools/qml/CMakeLists.txt | 17 +++++++++--------
tools/qmlcachegen/.prev_CMakeLists.txt | 3 ++-
tools/qmlcachegen/CMakeLists.txt | 3 ++-
tools/qmlformat/.prev_CMakeLists.txt | 3 ++-
tools/qmlformat/CMakeLists.txt | 3 ++-
tools/qmlimportscanner/.prev_CMakeLists.txt | 3 ++-
tools/qmlimportscanner/CMakeLists.txt | 3 ++-
tools/qmljs/.prev_CMakeLists.txt | 19 ++++++++++---------
tools/qmljs/CMakeLists.txt | 19 ++++++++++---------
tools/qmllint/.prev_CMakeLists.txt | 3 ++-
tools/qmllint/CMakeLists.txt | 3 ++-
tools/qmlplugindump/.prev_CMakeLists.txt | 7 ++++---
tools/qmlplugindump/CMakeLists.txt | 7 ++++---
tools/qmlpreview/.prev_CMakeLists.txt | 3 ++-
tools/qmlpreview/CMakeLists.txt | 3 ++-
tools/qmlprofiler/.prev_CMakeLists.txt | 3 ++-
tools/qmlprofiler/CMakeLists.txt | 3 ++-
tools/qmlscene/.prev_CMakeLists.txt | 7 ++++---
tools/qmlscene/CMakeLists.txt | 7 ++++---
tools/qmltestrunner/.prev_CMakeLists.txt | 3 ++-
tools/qmltestrunner/CMakeLists.txt | 3 ++-
tools/qmltime/CMakeLists.txt | 1 +
25 files changed, 87 insertions(+), 61 deletions(-)
diff --git a/src/qmltyperegistrar/.prev_CMakeLists.txt b/src/qmltyperegistrar/.prev_CMakeLists.txt
index 5809054824..365aa30e40 100644
--- a/src/qmltyperegistrar/.prev_CMakeLists.txt
+++ b/src/qmltyperegistrar/.prev_CMakeLists.txt
@@ -4,7 +4,8 @@
## qmltyperegistrar Tool:
#####################################################################
-qt_add_tool(qmltyperegistrar
+qt_get_tool_target_name(target_name qmltyperegistrar)
+qt_add_tool(${target_name}
TARGET_DESCRIPTION "QML Types Registrar"
SOURCES
../../tools/shared/qmlstreamwriter.cpp ../../tools/shared/qmlstreamwriter.h
diff --git a/src/qmltyperegistrar/CMakeLists.txt b/src/qmltyperegistrar/CMakeLists.txt
index f7f68bf3dd..ad603e897c 100644
--- a/src/qmltyperegistrar/CMakeLists.txt
+++ b/src/qmltyperegistrar/CMakeLists.txt
@@ -4,7 +4,8 @@
## qmltyperegistrar Tool:
#####################################################################
-qt_add_tool(qmltyperegistrar
+qt_get_tool_target_name(target_name qmltyperegistrar)
+qt_add_tool(${target_name}
TARGET_DESCRIPTION "QML Types Registrar"
TOOLS_TARGET Qml # special case
SOURCES
diff --git a/tools/qml/.prev_CMakeLists.txt b/tools/qml/.prev_CMakeLists.txt
index 0c291d5292..a247b4bb4e 100644
--- a/tools/qml/.prev_CMakeLists.txt
+++ b/tools/qml/.prev_CMakeLists.txt
@@ -4,7 +4,8 @@
## qml Tool:
#####################################################################
-qt_add_tool(qml
+qt_get_tool_target_name(target_name qml)
+qt_add_tool(${target_name}
TARGET_DESCRIPTION "QML Runtime"
SOURCES
conf.h
@@ -23,7 +24,7 @@ set(qml_resource_files
"resources/qml-64.png"
)
-qt_add_resource(qml "qml"
+qt_add_resource(${target_name} "qml"
PREFIX
"/qt-project.org/QmlRuntime"
FILES
@@ -40,12 +41,12 @@ qt_add_resource(qml "qml"
## Scopes:
#####################################################################
-qt_extend_target(qml CONDITION TARGET Qt::Gui
+qt_extend_target(${target_name} CONDITION TARGET Qt::Gui
PUBLIC_LIBRARIES
Qt::Gui
)
-qt_extend_target(qml CONDITION TARGET Qt::Widgets
+qt_extend_target(${target_name} CONDITION TARGET Qt::Widgets
PUBLIC_LIBRARIES
Qt::Widgets
)
@@ -58,14 +59,15 @@ qt_extend_target(qml CONDITION TARGET Qt::Widgets
# OTHER_FILES = "resources/Info.plist"
# QMAKE_INFO_PLIST = "resources/Info.plist"
-qt_extend_target(qml CONDITION QT_FEATURE_qml_debug
+qt_extend_target(${target_name} CONDITION QT_FEATURE_qml_debug
DEFINES
QT_QML_DEBUG_NO_WARNING
)
-set_target_properties(qml PROPERTIES
+set_target_properties(${target_name} PROPERTIES
+ QT_QML_MODULE_INSTALL_QMLTYPES TRUE
QT_QML_MODULE_VERSION 1.0
QT_QML_MODULE_URI QmlRuntime.Config
)
-qt6_qml_type_registration(qml)
+qt6_qml_type_registration(${target_name})
diff --git a/tools/qml/CMakeLists.txt b/tools/qml/CMakeLists.txt
index d4f803ff04..839c8b1516 100644
--- a/tools/qml/CMakeLists.txt
+++ b/tools/qml/CMakeLists.txt
@@ -4,7 +4,8 @@
## qml Tool:
#####################################################################
-qt_add_tool(qml
+qt_get_tool_target_name(target_name qml)
+qt_add_tool(${target_name}
TARGET_DESCRIPTION "QML Runtime"
TOOLS_TARGET Qml # special case
SOURCES
@@ -40,7 +41,7 @@ set(qml_resource_files
"resources/qml-64.png"
)
-qt_add_resource(qml "qml"
+qt_add_resource(${target_name} "qml"
PREFIX
"/qt-project.org/QmlRuntime"
FILES
@@ -57,12 +58,12 @@ qt_add_resource(qml "qml"
## Scopes:
#####################################################################
-qt_extend_target(qml CONDITION TARGET Qt::Gui
+qt_extend_target(${target_name} CONDITION TARGET Qt::Gui
PUBLIC_LIBRARIES
Qt::Gui
)
-qt_extend_target(qml CONDITION TARGET Qt::Widgets
+qt_extend_target(${target_name} CONDITION TARGET Qt::Widgets
PUBLIC_LIBRARIES
Qt::Widgets
)
@@ -75,14 +76,14 @@ qt_extend_target(qml CONDITION TARGET Qt::Widgets
# OTHER_FILES = "resources/Info.plist"
# QMAKE_INFO_PLIST = "resources/Info.plist"
-qt_extend_target(qml CONDITION QT_FEATURE_qml_debug
+qt_extend_target(${target_name} CONDITION QT_FEATURE_qml_debug
DEFINES
QT_QML_DEBUG_NO_WARNING
)
-set_target_properties(qml PROPERTIES
+set_target_properties(${target_name} PROPERTIES
+ QT_QML_MODULE_INSTALL_QMLTYPES TRUE
QT_QML_MODULE_VERSION 1.0
QT_QML_MODULE_URI QmlRuntime.Config
)
-qt6_qml_type_registration(qml)
-
+qt6_qml_type_registration(${target_name})
diff --git a/tools/qmlcachegen/.prev_CMakeLists.txt b/tools/qmlcachegen/.prev_CMakeLists.txt
index afae63737a..6580f3ee83 100644
--- a/tools/qmlcachegen/.prev_CMakeLists.txt
+++ b/tools/qmlcachegen/.prev_CMakeLists.txt
@@ -4,7 +4,8 @@
## qmlcachegen Tool:
#####################################################################
-qt_add_tool(qmlcachegen
+qt_get_tool_target_name(target_name qmlcachegen)
+qt_add_tool(${target_name}
TARGET_DESCRIPTION "QML Cache Generator"
SOURCES
../shared/resourcefilemapper.cpp ../shared/resourcefilemapper.h
diff --git a/tools/qmlcachegen/CMakeLists.txt b/tools/qmlcachegen/CMakeLists.txt
index d2c109d002..f991b52271 100644
--- a/tools/qmlcachegen/CMakeLists.txt
+++ b/tools/qmlcachegen/CMakeLists.txt
@@ -4,7 +4,8 @@
## qmlcachegen Tool:
#####################################################################
-qt_add_tool(qmlcachegen
+qt_get_tool_target_name(target_name qmlcachegen)
+qt_add_tool(${target_name}
TARGET_DESCRIPTION "QML Cache Generator"
TOOLS_TARGET Qml # special case
SOURCES
diff --git a/tools/qmlformat/.prev_CMakeLists.txt b/tools/qmlformat/.prev_CMakeLists.txt
index 940e68d9d0..e99eca96e1 100644
--- a/tools/qmlformat/.prev_CMakeLists.txt
+++ b/tools/qmlformat/.prev_CMakeLists.txt
@@ -4,7 +4,8 @@
## qmlformat Tool:
#####################################################################
-qt_add_tool(qmlformat
+qt_get_tool_target_name(target_name qmlformat)
+qt_add_tool(${target_name}
TARGET_DESCRIPTION "QML Formatter"
SOURCES
commentastvisitor.cpp commentastvisitor.h
diff --git a/tools/qmlformat/CMakeLists.txt b/tools/qmlformat/CMakeLists.txt
index bfafe972ef..73d106a1c1 100644
--- a/tools/qmlformat/CMakeLists.txt
+++ b/tools/qmlformat/CMakeLists.txt
@@ -4,7 +4,8 @@
## qmlformat Tool:
#####################################################################
-qt_add_tool(qmlformat
+qt_get_tool_target_name(target_name qmlformat)
+qt_add_tool(${target_name}
TARGET_DESCRIPTION "QML Formatter"
TOOLS_TARGET Qml # special case
SOURCES
diff --git a/tools/qmlimportscanner/.prev_CMakeLists.txt b/tools/qmlimportscanner/.prev_CMakeLists.txt
index 0ff1581279..2d589acf24 100644
--- a/tools/qmlimportscanner/.prev_CMakeLists.txt
+++ b/tools/qmlimportscanner/.prev_CMakeLists.txt
@@ -4,7 +4,8 @@
## qmlimportscanner Tool:
#####################################################################
-qt_add_tool(qmlimportscanner
+qt_get_tool_target_name(target_name qmlimportscanner)
+qt_add_tool(${target_name}
TARGET_DESCRIPTION "QML Import Scanner"
SOURCES
../shared/resourcefilemapper.cpp ../shared/resourcefilemapper.h
diff --git a/tools/qmlimportscanner/CMakeLists.txt b/tools/qmlimportscanner/CMakeLists.txt
index 068b9c3078..dfe24cfc26 100644
--- a/tools/qmlimportscanner/CMakeLists.txt
+++ b/tools/qmlimportscanner/CMakeLists.txt
@@ -4,7 +4,8 @@
## qmlimportscanner Tool:
#####################################################################
-qt_add_tool(qmlimportscanner
+qt_get_tool_target_name(target_name qmlimportscanner)
+qt_add_tool(${target_name}
TARGET_DESCRIPTION "QML Import Scanner"
TOOLS_TARGET Qml # special case
SOURCES
diff --git a/tools/qmljs/.prev_CMakeLists.txt b/tools/qmljs/.prev_CMakeLists.txt
index 3bbec9b02a..621f54a18b 100644
--- a/tools/qmljs/.prev_CMakeLists.txt
+++ b/tools/qmljs/.prev_CMakeLists.txt
@@ -4,7 +4,8 @@
## qmljs Tool:
#####################################################################
-qt_add_tool(qmljs
+qt_get_tool_target_name(target_name qmljs)
+qt_add_tool(${target_name}
TARGET_DESCRIPTION "QML JavaScript Tool"
SOURCES
qmljs.cpp
@@ -44,42 +45,42 @@ qt_add_tool(qmljs
## Scopes:
#####################################################################
-qt_extend_target(qmljs CONDITION WIN32
+qt_extend_target(${target_name} CONDITION WIN32
DEFINES
NOMINMAX
)
-qt_extend_target(qmljs CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64"))
+qt_extend_target(${target_name} CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64"))
DEFINES
WTF_USE_UDIS86=1
)
-qt_extend_target(qmljs CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler
+qt_extend_target(${target_name} CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler
DEFINES
WTF_USE_ARMV7_DISASSEMBLER=1
)
-qt_extend_target(qmljs CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler
+qt_extend_target(${target_name} CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler
DEFINES
WTF_USE_ARM64_DISASSEMBLER=1
)
-qt_extend_target(qmljs CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler
+qt_extend_target(${target_name} CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler
DEFINES
WTF_USE_MIPS32_DISASSEMBLER=1
)
-qt_extend_target(qmljs CONDITION NOT disassembler
+qt_extend_target(${target_name} CONDITION NOT disassembler
DEFINES
WTF_USE_UDIS86=0
)
-qt_extend_target(qmljs CONDITION CMAKE_BUILD_TYPE STREQUAL Release
+qt_extend_target(${target_name} CONDITION CMAKE_BUILD_TYPE STREQUAL Release
DEFINES
NDEBUG
)
-qt_extend_target(qmljs CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC
+qt_extend_target(${target_name} CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC
COMPILE_OPTIONS
-Wno-expansion-to-defined
)
diff --git a/tools/qmljs/CMakeLists.txt b/tools/qmljs/CMakeLists.txt
index 257f5fdb6e..e4e2cf1b7a 100644
--- a/tools/qmljs/CMakeLists.txt
+++ b/tools/qmljs/CMakeLists.txt
@@ -4,7 +4,8 @@
## qmljs Tool:
#####################################################################
-qt_add_tool(qmljs
+qt_get_tool_target_name(target_name qmljs)
+qt_add_tool(${target_name}
TARGET_DESCRIPTION "QML JavaScript Tool"
TOOLS_TARGET Qml # special case
SOURCES
@@ -45,42 +46,42 @@ qt_add_tool(qmljs
## Scopes:
#####################################################################
-qt_extend_target(qmljs CONDITION WIN32
+qt_extend_target(${target_name} CONDITION WIN32
DEFINES
NOMINMAX
)
-qt_extend_target(qmljs CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64"))
+qt_extend_target(${target_name} CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64"))
DEFINES
WTF_USE_UDIS86=1
)
-qt_extend_target(qmljs CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler
+qt_extend_target(${target_name} CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler
DEFINES
WTF_USE_ARMV7_DISASSEMBLER=1
)
-qt_extend_target(qmljs CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler
+qt_extend_target(${target_name} CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler
DEFINES
WTF_USE_ARM64_DISASSEMBLER=1
)
-qt_extend_target(qmljs CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler
+qt_extend_target(${target_name} CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler
DEFINES
WTF_USE_MIPS32_DISASSEMBLER=1
)
-qt_extend_target(qmljs CONDITION NOT disassembler
+qt_extend_target(${target_name} CONDITION NOT disassembler
DEFINES
WTF_USE_UDIS86=0
)
-qt_extend_target(qmljs CONDITION CMAKE_BUILD_TYPE STREQUAL Release
+qt_extend_target(${target_name} CONDITION CMAKE_BUILD_TYPE STREQUAL Release
DEFINES
NDEBUG
)
-qt_extend_target(qmljs CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC
+qt_extend_target(${target_name} CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC
COMPILE_OPTIONS
-Wno-expansion-to-defined
)
diff --git a/tools/qmllint/.prev_CMakeLists.txt b/tools/qmllint/.prev_CMakeLists.txt
index b0bc24d89d..2bb98260f6 100644
--- a/tools/qmllint/.prev_CMakeLists.txt
+++ b/tools/qmllint/.prev_CMakeLists.txt
@@ -4,7 +4,8 @@
## qmllint Tool:
#####################################################################
-qt_add_tool(qmllint
+qt_get_tool_target_name(target_name qmllint)
+qt_add_tool(${target_name}
TARGET_DESCRIPTION "QML Syntax Verifier"
SOURCES
../shared/componentversion.cpp ../shared/componentversion.h
diff --git a/tools/qmllint/CMakeLists.txt b/tools/qmllint/CMakeLists.txt
index a42f700f45..03b7854682 100644
--- a/tools/qmllint/CMakeLists.txt
+++ b/tools/qmllint/CMakeLists.txt
@@ -4,7 +4,8 @@
## qmllint Tool:
#####################################################################
-qt_add_tool(qmllint
+qt_get_tool_target_name(target_name qmllint)
+qt_add_tool(${target_name}
TARGET_DESCRIPTION "QML Syntax Verifier"
TOOLS_TARGET Qml # special case
SOURCES
diff --git a/tools/qmlplugindump/.prev_CMakeLists.txt b/tools/qmlplugindump/.prev_CMakeLists.txt
index 078c20bf08..79a4b0b18d 100644
--- a/tools/qmlplugindump/.prev_CMakeLists.txt
+++ b/tools/qmlplugindump/.prev_CMakeLists.txt
@@ -4,7 +4,8 @@
## qmlplugindump Tool:
#####################################################################
-qt_add_tool(qmlplugindump
+qt_get_tool_target_name(target_name qmlplugindump)
+qt_add_tool(${target_name}
TARGET_DESCRIPTION "QML Plugin Metadata Dumper"
SOURCES
../shared/qmlstreamwriter.cpp ../shared/qmlstreamwriter.h
@@ -27,12 +28,12 @@ qt_add_tool(qmlplugindump
## Scopes:
#####################################################################
-qt_extend_target(qmlplugindump CONDITION TARGET Qt::Widgets
+qt_extend_target(${target_name} CONDITION TARGET Qt::Widgets
PUBLIC_LIBRARIES
Qt::Widgets
)
-qt_extend_target(qmlplugindump CONDITION MACOS
+qt_extend_target(${target_name} CONDITION MACOS
LINK_OPTIONS
"-Wl,-sectcreate,__TEXT,__info_plist,$$shell_quote$$PWD/Info.plist"
)
diff --git a/tools/qmlplugindump/CMakeLists.txt b/tools/qmlplugindump/CMakeLists.txt
index 63c0f398a4..cbeb03f38b 100644
--- a/tools/qmlplugindump/CMakeLists.txt
+++ b/tools/qmlplugindump/CMakeLists.txt
@@ -4,7 +4,8 @@
## qmlplugindump Tool:
#####################################################################
-qt_add_tool(qmlplugindump
+qt_get_tool_target_name(target_name qmlplugindump)
+qt_add_tool(${target_name}
TARGET_DESCRIPTION "QML Plugin Metadata Dumper"
TOOLS_TARGET Qml # special case
SOURCES
@@ -28,12 +29,12 @@ qt_add_tool(qmlplugindump
## Scopes:
#####################################################################
-qt_extend_target(qmlplugindump CONDITION TARGET Qt::Widgets
+qt_extend_target(${target_name} CONDITION TARGET Qt::Widgets
PUBLIC_LIBRARIES
Qt::Widgets
)
-qt_extend_target(qmlplugindump CONDITION MACOS
+qt_extend_target(${target_name} CONDITION MACOS
LINK_OPTIONS
"-Wl,-sectcreate,__TEXT,__info_plist,${CMAKE_CURRENT_SOURCE_DIR}/Info.plist" # special case
)
diff --git a/tools/qmlpreview/.prev_CMakeLists.txt b/tools/qmlpreview/.prev_CMakeLists.txt
index a2ebba7f50..e8cfaa528a 100644
--- a/tools/qmlpreview/.prev_CMakeLists.txt
+++ b/tools/qmlpreview/.prev_CMakeLists.txt
@@ -4,7 +4,8 @@
## qmlpreview Tool:
#####################################################################
-qt_add_tool(qmlpreview
+qt_get_tool_target_name(target_name qmlpreview)
+qt_add_tool(${target_name}
TARGET_DESCRIPTION "QML Preview"
SOURCES
main.cpp
diff --git a/tools/qmlpreview/CMakeLists.txt b/tools/qmlpreview/CMakeLists.txt
index 1952e2513d..3df5a921cf 100644
--- a/tools/qmlpreview/CMakeLists.txt
+++ b/tools/qmlpreview/CMakeLists.txt
@@ -4,7 +4,8 @@
## qmlpreview Tool:
#####################################################################
-qt_add_tool(qmlpreview
+qt_get_tool_target_name(target_name qmlpreview)
+qt_add_tool(${target_name}
TARGET_DESCRIPTION "QML Preview"
TOOLS_TARGET Qml # special case
SOURCES
diff --git a/tools/qmlprofiler/.prev_CMakeLists.txt b/tools/qmlprofiler/.prev_CMakeLists.txt
index 7969714e8a..27121615bd 100644
--- a/tools/qmlprofiler/.prev_CMakeLists.txt
+++ b/tools/qmlprofiler/.prev_CMakeLists.txt
@@ -4,7 +4,8 @@
## qmlprofiler Tool:
#####################################################################
-qt_add_tool(qmlprofiler
+qt_get_tool_target_name(target_name qmlprofiler)
+qt_add_tool(${target_name}
TARGET_DESCRIPTION "QML Profiler"
SOURCES
commandlistener.cpp commandlistener.h
diff --git a/tools/qmlprofiler/CMakeLists.txt b/tools/qmlprofiler/CMakeLists.txt
index 79c1b732ee..77943aa397 100644
--- a/tools/qmlprofiler/CMakeLists.txt
+++ b/tools/qmlprofiler/CMakeLists.txt
@@ -4,7 +4,8 @@
## qmlprofiler Tool:
#####################################################################
-qt_add_tool(qmlprofiler
+qt_get_tool_target_name(target_name qmlprofiler)
+qt_add_tool(${target_name}
TARGET_DESCRIPTION "QML Profiler"
TOOLS_TARGET Qml # special case
SOURCES
diff --git a/tools/qmlscene/.prev_CMakeLists.txt b/tools/qmlscene/.prev_CMakeLists.txt
index 61edc7deff..c1f7a78dd3 100644
--- a/tools/qmlscene/.prev_CMakeLists.txt
+++ b/tools/qmlscene/.prev_CMakeLists.txt
@@ -4,7 +4,8 @@
## qmlscene Tool:
#####################################################################
-qt_add_tool(qmlscene
+qt_get_tool_target_name(target_name qmlscene)
+qt_add_tool(${target_name}
TARGET_DESCRIPTION "QML Scene Viewer"
SOURCES
main.cpp
@@ -25,12 +26,12 @@ qt_add_tool(qmlscene
## Scopes:
#####################################################################
-qt_extend_target(qmlscene CONDITION TARGET Qt::Widgets
+qt_extend_target(${target_name} CONDITION TARGET Qt::Widgets
PUBLIC_LIBRARIES
Qt::Widgets
)
-qt_extend_target(qmlscene CONDITION QT_FEATURE_qml_debug
+qt_extend_target(${target_name} CONDITION QT_FEATURE_qml_debug
DEFINES
QT_QML_DEBUG_NO_WARNING
)
diff --git a/tools/qmlscene/CMakeLists.txt b/tools/qmlscene/CMakeLists.txt
index c5dda83fd8..7e385653c1 100644
--- a/tools/qmlscene/CMakeLists.txt
+++ b/tools/qmlscene/CMakeLists.txt
@@ -4,7 +4,8 @@
## qmlscene Tool:
#####################################################################
-qt_add_tool(qmlscene
+qt_get_tool_target_name(target_name qmlscene)
+qt_add_tool(${target_name}
TARGET_DESCRIPTION "QML Scene Viewer"
TOOLS_TARGET Qml # special case
SOURCES
@@ -26,12 +27,12 @@ qt_add_tool(qmlscene
## Scopes:
#####################################################################
-qt_extend_target(qmlscene CONDITION TARGET Qt::Widgets
+qt_extend_target(${target_name} CONDITION TARGET Qt::Widgets
PUBLIC_LIBRARIES
Qt::Widgets
)
-qt_extend_target(qmlscene CONDITION QT_FEATURE_qml_debug
+qt_extend_target(${target_name} CONDITION QT_FEATURE_qml_debug
DEFINES
QT_QML_DEBUG_NO_WARNING
)
diff --git a/tools/qmltestrunner/.prev_CMakeLists.txt b/tools/qmltestrunner/.prev_CMakeLists.txt
index e27f88a2ea..4744ad5c80 100644
--- a/tools/qmltestrunner/.prev_CMakeLists.txt
+++ b/tools/qmltestrunner/.prev_CMakeLists.txt
@@ -4,7 +4,8 @@
## qmltestrunner Tool:
#####################################################################
-qt_add_tool(qmltestrunner
+qt_get_tool_target_name(target_name qmltestrunner)
+qt_add_tool(${target_name}
TARGET_DESCRIPTION "QML Test Runner"
SOURCES
main.cpp
diff --git a/tools/qmltestrunner/CMakeLists.txt b/tools/qmltestrunner/CMakeLists.txt
index f1df677621..370c1054a6 100644
--- a/tools/qmltestrunner/CMakeLists.txt
+++ b/tools/qmltestrunner/CMakeLists.txt
@@ -4,7 +4,8 @@
## qmltestrunner Tool:
#####################################################################
-qt_add_tool(qmltestrunner
+qt_get_tool_target_name(target_name qmltestrunner)
+qt_add_tool(${target_name}
TARGET_DESCRIPTION "QML Test Runner"
TOOLS_TARGET Qml # special case
SOURCES
diff --git a/tools/qmltime/CMakeLists.txt b/tools/qmltime/CMakeLists.txt
index 40161d1c1a..03425e9ecf 100644
--- a/tools/qmltime/CMakeLists.txt
+++ b/tools/qmltime/CMakeLists.txt
@@ -25,6 +25,7 @@ qt_add_executable(qmltime
#####################################################################
set_target_properties(qmltime PROPERTIES
+ QT_QML_MODULE_INSTALL_QMLTYPES TRUE
QT_QML_MODULE_VERSION 1.0
QT_QML_MODULE_URI QmlTime
)
--
2.25.1

6
recipes-qt/qt6/qtdeclarative_git.bb
View File

@ -12,11 +12,15 @@ inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc
SRC_URI += "\
file://0001-Regenerate-CMakeLists.patch \
"
DEPENDS += "qtbase qtdeclarative-native"
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "24abd0d14ebd420c275fa4e49ddb1a43b441c74f"
SRCREV = "fedc75b518854ecf5ac2360cfc735f2b213d4a1f"
do_install_append() {
# broken installation of plugins.qmltypes

2
recipes-qt/qt6/qtgraphicaleffects_git.bb
View File

@ -17,4 +17,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtdeclarative"
SRCREV = "fb53552f5e97b54442e7e83020972a13e3329029"
SRCREV = "93e05abbbebc9ff5d2daecbe3b03978cfc00af03"

72
recipes-qt/qt6/qtquick3d/0001-Regenerate-CMakeLists.patch Normal file
View File

@ -0,0 +1,72 @@
From 9a26026d2f293af4d9cbd0b1c21aba3073319853 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Tue, 2 Jun 2020 14:51:07 +0300
Subject: [PATCH] Regenerate CMakeLists
Change-Id: I5917b2b86b23ac24a2fa99f8bf55436e7e96a0d2
---
tools/balsam/.prev_CMakeLists.txt | 3 ++-
tools/balsam/CMakeLists.txt | 3 ++-
tools/meshdebug/.prev_CMakeLists.txt | 3 ++-
tools/meshdebug/CMakeLists.txt | 3 ++-
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/tools/balsam/.prev_CMakeLists.txt b/tools/balsam/.prev_CMakeLists.txt
index b42e580..f2736e5 100644
--- a/tools/balsam/.prev_CMakeLists.txt
+++ b/tools/balsam/.prev_CMakeLists.txt
@@ -4,7 +4,8 @@
## balsam Tool:
#####################################################################
-qt_add_tool(balsam
+qt_get_tool_target_name(target_name balsam)
+qt_add_tool(${target_name}
SOURCES
main.cpp
PUBLIC_LIBRARIES
diff --git a/tools/balsam/CMakeLists.txt b/tools/balsam/CMakeLists.txt
index 55a090d..c8cd1d2 100644
--- a/tools/balsam/CMakeLists.txt
+++ b/tools/balsam/CMakeLists.txt
@@ -4,7 +4,8 @@
## balsam Tool:
#####################################################################
-qt_add_tool(balsam
+qt_get_tool_target_name(target_name balsam)
+qt_add_tool(${target_name}
TOOLS_TARGET Quick3D # special case
SOURCES
main.cpp
diff --git a/tools/meshdebug/.prev_CMakeLists.txt b/tools/meshdebug/.prev_CMakeLists.txt
index 9ca4153..34815a5 100644
--- a/tools/meshdebug/.prev_CMakeLists.txt
+++ b/tools/meshdebug/.prev_CMakeLists.txt
@@ -4,7 +4,8 @@
## meshdebug Tool:
#####################################################################
-qt_add_tool(meshdebug
+qt_get_tool_target_name(target_name meshdebug)
+qt_add_tool(${target_name}
SOURCES
main.cpp
PUBLIC_LIBRARIES
diff --git a/tools/meshdebug/CMakeLists.txt b/tools/meshdebug/CMakeLists.txt
index 18872bd..a99ad77 100644
--- a/tools/meshdebug/CMakeLists.txt
+++ b/tools/meshdebug/CMakeLists.txt
@@ -4,7 +4,8 @@
## meshdebug Tool:
#####################################################################
-qt_add_tool(meshdebug
+qt_get_tool_target_name(target_name meshdebug)
+qt_add_tool(${target_name}
TOOLS_TARGET Quick3D # special case
SOURCES
main.cpp
--
2.25.1

3
recipes-qt/qt6/qtquick3d_git.bb
View File

@ -10,6 +10,7 @@ include recipes-qt/qt6/qt6.inc
SRC_URI += " \
git://github.com/assimp/assimp.git;name=assimp;branch=assimp_5.0_release;protocol=https;destsuffix=git/src/3rdparty/assimp/src \
file://0001-Regenerate-CMakeLists.patch \
"
DEPENDS = "qtbase qtdeclarative qtshadertools qtshadertools-native"
@ -23,7 +24,7 @@ _FILES_${PN}-qmlplugins += " \
${OE_QMAKE_PATH_QML}/QtQuick3D/Helpers/meshes/*.mesh \
"
SRCREV_qtquick3d = "f0bea57820951435e44b1e1aa113617bdcc59622"
SRCREV_qtquick3d = "1b7b167ede6ca8a19a8dd760458898f1c23abfc3"
SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df"
SRCREV_FORMAT = "qtquick3d_assimp"

2
recipes-qt/qt6/qtquickcontrols2_git.bb
View File

@ -16,4 +16,4 @@ do_configure_prepend() {
sed -i -e 's/QmlTools//' ${S}/CMakeLists.txt
}
SRCREV = "4e1e01c4e484337586a7419e28c3625055f88038"
SRCREV = "257054f2cc6d79e763a12b350ffcc18787d0ac8c"

42
recipes-qt/qt6/qtshadertools/0001-Regenerate-CMakeLists.patch Normal file
View File

@ -0,0 +1,42 @@
From ebaf42e43f5ad04dc0c8aff84777ca626a407ec0 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Tue, 2 Jun 2020 12:44:35 +0300
Subject: [PATCH] Regenerate CMakeLists
Change-Id: I9026f90e41c1e5b9b0927382e65734a5642638b2
---
tools/qsb/.prev_CMakeLists.txt | 3 ++-
tools/qsb/CMakeLists.txt | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/tools/qsb/.prev_CMakeLists.txt b/tools/qsb/.prev_CMakeLists.txt
index a1719c6..34bb64d 100644
--- a/tools/qsb/.prev_CMakeLists.txt
+++ b/tools/qsb/.prev_CMakeLists.txt
@@ -4,7 +4,8 @@
## qsb Tool:
#####################################################################
-qt_add_tool(qsb
+qt_get_tool_target_name(target_name qsb)
+qt_add_tool(${target_name}
SOURCES
qsb.cpp
PUBLIC_LIBRARIES
diff --git a/tools/qsb/CMakeLists.txt b/tools/qsb/CMakeLists.txt
index 3a0a7b9..8dc8ca6 100644
--- a/tools/qsb/CMakeLists.txt
+++ b/tools/qsb/CMakeLists.txt
@@ -11,7 +11,8 @@ endif()
## qsb Tool:
#####################################################################
-qt_add_tool(qsb
+qt_get_tool_target_name(target_name qsb)
+qt_add_tool(${target_name}
TOOLS_TARGET # special case
ShaderTools # special case
SOURCES
--
2.25.1

4
recipes-qt/qt6/qtshadertools_git.bb
View File

@ -8,6 +8,10 @@ inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc
SRC_URI += "\
file://0001-Regenerate-CMakeLists.patch \
"
DEPENDS = "qtbase qtshadertools-native"
BBCLASSEXTEND =+ "native nativesdk"

623
recipes-qt/qt6/qttools/0001-Regenerate-CMakeLists.patch Normal file
View File

@ -0,0 +1,623 @@
From 4b2be44ed2a26fa2d2aa93c5ecbcb111587fd7df Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Tue, 2 Jun 2020 07:20:46 +0300
Subject: [PATCH] Regenerate CMakeLists
Change-Id: I914c1b4c12ad3dbcfade11466b83a632a43a778c
---
.../qcollectiongenerator/.prev_CMakeLists.txt | 4 +++-
src/assistant/qcollectiongenerator/CMakeLists.txt | 4 +++-
src/assistant/qhelpgenerator/.prev_CMakeLists.txt | 5 ++++-
src/assistant/qhelpgenerator/CMakeLists.txt | 5 ++++-
src/linguist/lconvert/.prev_CMakeLists.txt | 4 +++-
src/linguist/lconvert/CMakeLists.txt | 4 +++-
src/linguist/lprodump/.prev_CMakeLists.txt | 6 ++++--
src/linguist/lprodump/CMakeLists.txt | 6 ++++--
src/linguist/lrelease-pro/.prev_CMakeLists.txt | 4 +++-
src/linguist/lrelease-pro/CMakeLists.txt | 4 +++-
src/linguist/lrelease/.prev_CMakeLists.txt | 4 +++-
src/linguist/lrelease/CMakeLists.txt | 4 +++-
src/linguist/lupdate-pro/.prev_CMakeLists.txt | 6 ++++--
src/linguist/lupdate-pro/CMakeLists.txt | 6 ++++--
src/linguist/lupdate/.prev_CMakeLists.txt | 12 +++++++-----
src/linguist/lupdate/CMakeLists.txt | 12 +++++++-----
src/qdoc/.prev_CMakeLists.txt | 12 +++++++-----
src/qdoc/CMakeLists.txt | 12 +++++++-----
src/qtattributionsscanner/.prev_CMakeLists.txt | 6 +++++-
src/qtattributionsscanner/CMakeLists.txt | 6 +++++-
src/windeployqt/.prev_CMakeLists.txt | 10 +++++++---
src/windeployqt/CMakeLists.txt | 12 ++++++++----
src/winrtrunner/CMakeLists.txt | 6 +++++-
23 files changed, 106 insertions(+), 48 deletions(-)
diff --git a/src/assistant/qcollectiongenerator/.prev_CMakeLists.txt b/src/assistant/qcollectiongenerator/.prev_CMakeLists.txt
index ba927bd7..cfbcfc0a 100644
--- a/src/assistant/qcollectiongenerator/.prev_CMakeLists.txt
+++ b/src/assistant/qcollectiongenerator/.prev_CMakeLists.txt
@@ -4,7 +4,9 @@
## qcollectiongenerator Tool:
#####################################################################
-qt_add_tool(qcollectiongenerator
+qt_get_tool_target_name(target_name qcollectiongenerator)
+qt_add_tool(${target_name}
+ TARGET_DESCRIPTION "Qt Help Collection File Generator"
SOURCES
main.c
PUBLIC_LIBRARIES
diff --git a/src/assistant/qcollectiongenerator/CMakeLists.txt b/src/assistant/qcollectiongenerator/CMakeLists.txt
index cfd7cd92..97c8740d 100644
--- a/src/assistant/qcollectiongenerator/CMakeLists.txt
+++ b/src/assistant/qcollectiongenerator/CMakeLists.txt
@@ -4,7 +4,9 @@
## qcollectiongenerator Tool:
#####################################################################
-qt_add_tool(qcollectiongenerator
+qt_get_tool_target_name(target_name qcollectiongenerator)
+qt_add_tool(${target_name}
+ TARGET_DESCRIPTION "Qt Help Collection File Generator"
TOOLS_TARGET Tools # special case
SOURCES
main.c
diff --git a/src/assistant/qhelpgenerator/.prev_CMakeLists.txt b/src/assistant/qhelpgenerator/.prev_CMakeLists.txt
index a9653d99..cbf85063 100644
--- a/src/assistant/qhelpgenerator/.prev_CMakeLists.txt
+++ b/src/assistant/qhelpgenerator/.prev_CMakeLists.txt
@@ -4,7 +4,9 @@
## qhelpgenerator Tool:
#####################################################################
-qt_add_tool(qhelpgenerator
+qt_get_tool_target_name(target_name qhelpgenerator)
+qt_add_tool(${target_name}
+ TARGET_DESCRIPTION "Qt Compressed Help File Generator"
SOURCES
../shared/collectionconfiguration.cpp ../shared/collectionconfiguration.h
collectionconfigreader.cpp collectionconfigreader.h
@@ -21,3 +23,4 @@ qt_add_tool(qhelpgenerator
#### Keys ignored in scope 1:.:.:qhelpgenerator.pro:<TRUE>:
# QMAKE_TARGET_DESCRIPTION = "Qt Compressed Help File Generator"
# QTPLUGIN.platforms = "qminimal"
+# QTPLUGIN.sqldrivers = "qsqlite"
diff --git a/src/assistant/qhelpgenerator/CMakeLists.txt b/src/assistant/qhelpgenerator/CMakeLists.txt
index 5f9afc5c..540bb762 100644
--- a/src/assistant/qhelpgenerator/CMakeLists.txt
+++ b/src/assistant/qhelpgenerator/CMakeLists.txt
@@ -4,7 +4,9 @@
## qhelpgenerator Tool:
#####################################################################
-qt_add_tool(qhelpgenerator
+qt_get_tool_target_name(target_name qhelpgenerator)
+qt_add_tool(${target_name}
+ TARGET_DESCRIPTION "Qt Compressed Help File Generator"
TOOLS_TARGET Tools # special case
SOURCES
../shared/collectionconfiguration.cpp ../shared/collectionconfiguration.h
@@ -22,3 +24,4 @@ qt_add_tool(qhelpgenerator
#### Keys ignored in scope 1:.:.:qhelpgenerator.pro:<TRUE>:
# QMAKE_TARGET_DESCRIPTION = "Qt Compressed Help File Generator"
# QTPLUGIN.platforms = "qminimal"
+# QTPLUGIN.sqldrivers = "qsqlite"
diff --git a/src/linguist/lconvert/.prev_CMakeLists.txt b/src/linguist/lconvert/.prev_CMakeLists.txt
index e65bc854..f01e77da 100644
--- a/src/linguist/lconvert/.prev_CMakeLists.txt
+++ b/src/linguist/lconvert/.prev_CMakeLists.txt
@@ -4,7 +4,9 @@
## lconvert Tool:
#####################################################################
-qt_add_tool(lconvert
+qt_get_tool_target_name(target_name lconvert)
+qt_add_tool(${target_name}
+ TARGET_DESCRIPTION "Qt Translation File Converter"
SOURCES
../shared/numerus.cpp
../shared/po.cpp
diff --git a/src/linguist/lconvert/CMakeLists.txt b/src/linguist/lconvert/CMakeLists.txt
index a5dee94d..aba94640 100644
--- a/src/linguist/lconvert/CMakeLists.txt
+++ b/src/linguist/lconvert/CMakeLists.txt
@@ -4,7 +4,9 @@
## lconvert Tool:
#####################################################################
-qt_add_tool(lconvert
+qt_get_tool_target_name(target_name lconvert)
+qt_add_tool(${target_name}
+ TARGET_DESCRIPTION "Qt Translation File Converter"
TOOLS_TARGET Linguist # special case
SOURCES
../shared/numerus.cpp
diff --git a/src/linguist/lprodump/.prev_CMakeLists.txt b/src/linguist/lprodump/.prev_CMakeLists.txt
index 2fb6df7f..705b3998 100644
--- a/src/linguist/lprodump/.prev_CMakeLists.txt
+++ b/src/linguist/lprodump/.prev_CMakeLists.txt
@@ -4,7 +4,9 @@
## lprodump Tool:
#####################################################################
-qt_add_tool(lprodump
+qt_get_tool_target_name(target_name lprodump)
+qt_add_tool(${target_name}
+ TARGET_DESCRIPTION "Qt Linguist QMake Project Dump Tool"
SOURCES
../shared/ioutils.cpp ../shared/ioutils.h
../shared/profileevaluator.cpp ../shared/profileevaluator.h
@@ -37,7 +39,7 @@ set(proparser_resource_files
"exclusive_builds.prf"
)
-qt_add_resource(lprodump "proparser"
+qt_add_resource(${target_name} "proparser"
PREFIX
"/qmake/override_features"
BASE
diff --git a/src/linguist/lprodump/CMakeLists.txt b/src/linguist/lprodump/CMakeLists.txt
index 350b4593..a2ed6ba9 100644
--- a/src/linguist/lprodump/CMakeLists.txt
+++ b/src/linguist/lprodump/CMakeLists.txt
@@ -4,7 +4,9 @@
## lprodump Tool:
#####################################################################
-qt_add_tool(lprodump
+qt_get_tool_target_name(target_name lprodump)
+qt_add_tool(${target_name}
+ TARGET_DESCRIPTION "Qt Linguist QMake Project Dump Tool"
TOOLS_TARGET Linguist # special case
SOURCES
../shared/ioutils.cpp ../shared/ioutils.h
@@ -38,7 +40,7 @@ set(proparser_resource_files
"exclusive_builds.prf"
)
-qt_add_resource(lprodump "proparser"
+qt_add_resource(${target_name} "proparser"
PREFIX
"/qmake/override_features"
BASE
diff --git a/src/linguist/lrelease-pro/.prev_CMakeLists.txt b/src/linguist/lrelease-pro/.prev_CMakeLists.txt
index c1961603..9669234a 100644
--- a/src/linguist/lrelease-pro/.prev_CMakeLists.txt
+++ b/src/linguist/lrelease-pro/.prev_CMakeLists.txt
@@ -4,7 +4,9 @@
## lrelease-pro Tool:
#####################################################################
-qt_add_tool(lrelease-pro
+qt_get_tool_target_name(target_name lrelease-pro)
+qt_add_tool(${target_name}
+ TARGET_DESCRIPTION "Qt Translation File Compiler for QMake Projects"
SOURCES
../shared/runqttool.cpp ../shared/runqttool.h
main.cpp
diff --git a/src/linguist/lrelease-pro/CMakeLists.txt b/src/linguist/lrelease-pro/CMakeLists.txt
index 84db24fb..e77fdd3d 100644
--- a/src/linguist/lrelease-pro/CMakeLists.txt
+++ b/src/linguist/lrelease-pro/CMakeLists.txt
@@ -4,7 +4,9 @@
## lrelease-pro Tool:
#####################################################################
-qt_add_tool(lrelease-pro
+qt_get_tool_target_name(target_name lrelease-pro)
+qt_add_tool(${target_name}
+ TARGET_DESCRIPTION "Qt Translation File Compiler for QMake Projects"
TOOLS_TARGET Linguist # special case
SOURCES
../shared/runqttool.cpp ../shared/runqttool.h
diff --git a/src/linguist/lrelease/.prev_CMakeLists.txt b/src/linguist/lrelease/.prev_CMakeLists.txt
index b0f636ed..238b0e43 100644
--- a/src/linguist/lrelease/.prev_CMakeLists.txt
+++ b/src/linguist/lrelease/.prev_CMakeLists.txt
@@ -4,7 +4,9 @@
## lrelease Tool:
#####################################################################
-qt_add_tool(lrelease
+qt_get_tool_target_name(target_name lrelease)
+qt_add_tool(${target_name}
+ TARGET_DESCRIPTION "Qt Translation File Compiler"
SOURCES
../shared/numerus.cpp
../shared/po.cpp
diff --git a/src/linguist/lrelease/CMakeLists.txt b/src/linguist/lrelease/CMakeLists.txt
index 22e1dee2..6c3542ce 100644
--- a/src/linguist/lrelease/CMakeLists.txt
+++ b/src/linguist/lrelease/CMakeLists.txt
@@ -4,7 +4,9 @@
## lrelease Tool:
#####################################################################
-qt_add_tool(lrelease
+qt_get_tool_target_name(target_name lrelease)
+qt_add_tool(${target_name}
+ TARGET_DESCRIPTION "Qt Translation File Compiler"
TOOLS_TARGET Linguist # special case
SOURCES
../shared/numerus.cpp
diff --git a/src/linguist/lupdate-pro/.prev_CMakeLists.txt b/src/linguist/lupdate-pro/.prev_CMakeLists.txt
index 07f7af6f..51f7b8c8 100644
--- a/src/linguist/lupdate-pro/.prev_CMakeLists.txt
+++ b/src/linguist/lupdate-pro/.prev_CMakeLists.txt
@@ -4,7 +4,9 @@
## lupdate-pro Tool:
#####################################################################
-qt_add_tool(lupdate-pro
+qt_get_tool_target_name(target_name lupdate-pro)
+qt_add_tool(${target_name}
+ TARGET_DESCRIPTION "Qt Translation File Update Tool for QMake Projects"
SOURCES
../shared/runqttool.cpp ../shared/runqttool.h
main.cpp
@@ -25,5 +27,5 @@ qt_add_tool(lupdate-pro
## Scopes:
#####################################################################
-#### Keys ignored in scope 2:.:.:lupdate-pro.pro:mingw:
+#### Keys ignored in scope 2:.:.:lupdate-pro.pro:MINGW:
# RC_FILE = "lupdate-pro.rc"
diff --git a/src/linguist/lupdate-pro/CMakeLists.txt b/src/linguist/lupdate-pro/CMakeLists.txt
index c366a2d6..8df52b7f 100644
--- a/src/linguist/lupdate-pro/CMakeLists.txt
+++ b/src/linguist/lupdate-pro/CMakeLists.txt
@@ -4,7 +4,9 @@
## lupdate-pro Tool:
#####################################################################
-qt_add_tool(lupdate-pro
+qt_get_tool_target_name(target_name lupdate-pro)
+qt_add_tool(${target_name}
+ TARGET_DESCRIPTION "Qt Translation File Update Tool for QMake Projects"
TOOLS_TARGET Linguist # special case
SOURCES
../shared/runqttool.cpp ../shared/runqttool.h
@@ -26,5 +28,5 @@ qt_add_tool(lupdate-pro
## Scopes:
#####################################################################
-#### Keys ignored in scope 2:.:.:lupdate-pro.pro:mingw:
+#### Keys ignored in scope 2:.:.:lupdate-pro.pro:MINGW:
# RC_FILE = "lupdate-pro.rc"
diff --git a/src/linguist/lupdate/.prev_CMakeLists.txt b/src/linguist/lupdate/.prev_CMakeLists.txt
index 61d7ad7f..4df4d389 100644
--- a/src/linguist/lupdate/.prev_CMakeLists.txt
+++ b/src/linguist/lupdate/.prev_CMakeLists.txt
@@ -4,7 +4,9 @@
## lupdate Tool:
#####################################################################
-qt_add_tool(lupdate
+qt_get_tool_target_name(target_name lupdate)
+qt_add_tool(${target_name}
+ TARGET_DESCRIPTION "Qt Translation File Update Tool"
SOURCES
../shared/numerus.cpp
../shared/po.cpp
@@ -45,19 +47,19 @@ qt_add_tool(lupdate
## Scopes:
#####################################################################
-qt_extend_target(lupdate CONDITION TARGET Qt::QmlDevToolsPrivate
+qt_extend_target(${target_name} CONDITION TARGET Qt::QmlDevToolsPrivate
SOURCES
qdeclarative.cpp
PUBLIC_LIBRARIES
Qt::QmlDevToolsPrivate
)
-qt_extend_target(lupdate CONDITION NOT TARGET Qt::QmlDevToolsPrivate
+qt_extend_target(${target_name} CONDITION NOT TARGET Qt::QmlDevToolsPrivate
DEFINES
QT_NO_QML
)
-qt_extend_target(lupdate CONDITION QT_FEATURE_clangcpp
+qt_extend_target(${target_name} CONDITION QT_FEATURE_clangcpp
SOURCES
clangtoolastreader.cpp clangtoolastreader.h
cpp_clang.cpp cpp_clang.h
@@ -74,5 +76,5 @@ qt_extend_target(lupdate CONDITION QT_FEATURE_clangcpp
#### Keys ignored in scope 6:.:.:lupdate.pro:NOT QMAKE_DEFAULT_LIBDIRS___contains____ss_CLANG_LIBDIR AND NOT disable_external_rpath:
# QMAKE_RPATHDIR = "$$CLANG_LIBDIR"
-#### Keys ignored in scope 9:.:.:lupdate.pro:mingw:
+#### Keys ignored in scope 9:.:.:lupdate.pro:MINGW:
# RC_FILE = "lupdate.rc"
diff --git a/src/linguist/lupdate/CMakeLists.txt b/src/linguist/lupdate/CMakeLists.txt
index 04515bba..fe2e08a2 100644
--- a/src/linguist/lupdate/CMakeLists.txt
+++ b/src/linguist/lupdate/CMakeLists.txt
@@ -4,7 +4,9 @@
## lupdate Tool:
#####################################################################
-qt_add_tool(lupdate
+qt_get_tool_target_name(target_name lupdate)
+qt_add_tool(${target_name}
+ TARGET_DESCRIPTION "Qt Translation File Update Tool"
TOOLS_TARGET Linguist # special case
SOURCES
../shared/numerus.cpp
@@ -46,19 +48,19 @@ qt_add_tool(lupdate
## Scopes:
#####################################################################
-qt_extend_target(lupdate CONDITION TARGET Qt::QmlDevToolsPrivate
+qt_extend_target(${target_name} CONDITION TARGET Qt::QmlDevToolsPrivate
SOURCES
qdeclarative.cpp
PUBLIC_LIBRARIES
Qt::QmlDevToolsPrivate
)
-qt_extend_target(lupdate CONDITION NOT TARGET Qt::QmlDevToolsPrivate
+qt_extend_target(${target_name} CONDITION NOT TARGET Qt::QmlDevToolsPrivate
DEFINES
QT_NO_QML
)
-qt_extend_target(lupdate CONDITION QT_FEATURE_clangcpp
+qt_extend_target(${target_name} CONDITION QT_FEATURE_clangcpp
SOURCES
clangtoolastreader.cpp clangtoolastreader.h
cpp_clang.cpp cpp_clang.h
@@ -86,5 +88,5 @@ qt_extend_target(lupdate CONDITION QT_FEATURE_clangcpp
#### Keys ignored in scope 6:.:.:lupdate.pro:NOT QMAKE_DEFAULT_LIBDIRS___contains____ss_CLANG_LIBDIR AND NOT disable_external_rpath:
# QMAKE_RPATHDIR = "$$CLANG_LIBDIR"
-#### Keys ignored in scope 9:.:.:lupdate.pro:mingw:
+#### Keys ignored in scope 9:.:.:lupdate.pro:MINGW:
# RC_FILE = "lupdate.rc"
diff --git a/src/qdoc/.prev_CMakeLists.txt b/src/qdoc/.prev_CMakeLists.txt
index ce43e470..850edd58 100644
--- a/src/qdoc/.prev_CMakeLists.txt
+++ b/src/qdoc/.prev_CMakeLists.txt
@@ -4,7 +4,9 @@
## qdoc Tool:
#####################################################################
-qt_add_tool(qdoc
+qt_get_tool_target_name(target_name qdoc)
+qt_add_tool(${target_name}
+ TARGET_DESCRIPTION "Qt Documentation Compiler"
SOURCES
atom.cpp atom.h
clangcodeparser.cpp clangcodeparser.h
@@ -85,12 +87,12 @@ qt_add_tool(qdoc
#### Keys ignored in scope 2:.:.:qdoc.pro:NOT force_bootstrap:
# _REQUIREMENTS = "qtConfig(xmlstreamwriter)"
-qt_extend_target(qdoc CONDITION TARGET Qt::QmlDevToolsPrivate
+qt_extend_target(${target_name} CONDITION TARGET Qt::QmlDevToolsPrivate
PUBLIC_LIBRARIES
Qt::QmlDevToolsPrivate
)
-qt_extend_target(qdoc CONDITION NOT TARGET Qt::QmlDevToolsPrivate
+qt_extend_target(${target_name} CONDITION NOT TARGET Qt::QmlDevToolsPrivate
DEFINES
QT_NO_DECLARATIVE
)
@@ -98,7 +100,7 @@ qt_extend_target(qdoc CONDITION NOT TARGET Qt::QmlDevToolsPrivate
#### Keys ignored in scope 6:.:.:qdoc.pro:NOT QMAKE_DEFAULT_LIBDIRS___contains____ss_CLANG_LIBDIR AND NOT disable_external_rpath:
# QMAKE_RPATHDIR = "$$CLANG_LIBDIR"
-qt_extend_target(qdoc CONDITION win32-icc_x_ OR win32-msvc_x_
+qt_extend_target(${target_name} CONDITION win32-icc_x_ OR win32-msvc_x_
LINK_OPTIONS
"/STACK:4194304"
)
@@ -116,7 +118,7 @@ qt_extend_target(qdoc CONDITION win32-icc_x_ OR win32-msvc_x_
#### Keys ignored in scope 11:.:.:qdoc.pro:CMAKE_BIN_DIR___contains___^\\.\\./._x_:
# CMAKE_BIN_DIR = "$$[QT_HOST_BINS]/"
# CMAKE_BIN_DIR_IS_ABSOLUTE = "True"
-qt_add_docs(qdoc
+qt_add_docs(${target_name}
doc/config/qdoc.qdocconf
)
diff --git a/src/qdoc/CMakeLists.txt b/src/qdoc/CMakeLists.txt
index 456af22c..dc279cb5 100644
--- a/src/qdoc/CMakeLists.txt
+++ b/src/qdoc/CMakeLists.txt
@@ -4,7 +4,9 @@
## qdoc Tool:
#####################################################################
-qt_add_tool(qdoc
+qt_get_tool_target_name(target_name qdoc)
+qt_add_tool(${target_name}
+ TARGET_DESCRIPTION "Qt Documentation Compiler"
TOOLS_TARGET Tools # special case
SOURCES
atom.cpp atom.h
@@ -89,12 +91,12 @@ qt_add_tool(qdoc
#### Keys ignored in scope 2:.:.:qdoc.pro:NOT force_bootstrap:
# _REQUIREMENTS = "qtConfig(xmlstreamwriter)"
-qt_extend_target(qdoc CONDITION TARGET Qt::QmlDevToolsPrivate
+qt_extend_target(${target_name} CONDITION TARGET Qt::QmlDevToolsPrivate
PUBLIC_LIBRARIES
Qt::QmlDevToolsPrivate
)
-qt_extend_target(qdoc CONDITION NOT TARGET Qt::QmlDevToolsPrivate
+qt_extend_target(${target_name} CONDITION NOT TARGET Qt::QmlDevToolsPrivate
DEFINES
QT_NO_DECLARATIVE
)
@@ -102,7 +104,7 @@ qt_extend_target(qdoc CONDITION NOT TARGET Qt::QmlDevToolsPrivate
#### Keys ignored in scope 6:.:.:qdoc.pro:NOT QMAKE_DEFAULT_LIBDIRS___contains____ss_CLANG_LIBDIR AND NOT disable_external_rpath:
# QMAKE_RPATHDIR = "$$CLANG_LIBDIR"
-qt_extend_target(qdoc CONDITION win32-icc_x_ OR win32-msvc_x_
+qt_extend_target(${target_name} CONDITION win32-icc_x_ OR win32-msvc_x_
LINK_OPTIONS
"/STACK:4194304"
)
@@ -120,7 +122,7 @@ qt_extend_target(qdoc CONDITION win32-icc_x_ OR win32-msvc_x_
#### Keys ignored in scope 11:.:.:qdoc.pro:CMAKE_BIN_DIR___contains___^\\.\\./._x_:
# CMAKE_BIN_DIR = "$$[QT_HOST_BINS]/"
# CMAKE_BIN_DIR_IS_ABSOLUTE = "True"
-qt_add_docs(qdoc
+qt_add_docs(${target_name}
doc/config/qdoc.qdocconf
)
diff --git a/src/qtattributionsscanner/.prev_CMakeLists.txt b/src/qtattributionsscanner/.prev_CMakeLists.txt
index a7e7694e..17cd6482 100644
--- a/src/qtattributionsscanner/.prev_CMakeLists.txt
+++ b/src/qtattributionsscanner/.prev_CMakeLists.txt
@@ -4,7 +4,9 @@
## qtattributionsscanner Tool:
#####################################################################
-qt_add_tool(qtattributionsscanner
+qt_get_tool_target_name(target_name qtattributionsscanner)
+qt_add_tool(${target_name}
+ TARGET_DESCRIPTION "Qt Source Code Attribution Scanner"
SOURCES
jsongenerator.cpp jsongenerator.h
logging.h
@@ -28,7 +30,9 @@ qt_add_tool(qtattributionsscanner
# INSTALLS = "cmake_qattributionsscanner_tools_files"
# QMAKE_SUBSTITUTES = "cmake_qattributionsscanner_config_file" "cmake_qattributionsscanner_config_version_file"
# QMAKE_TARGET_DESCRIPTION = "Qt Source Code Attribution Scanner"
+# QT_FOR_CONFIG = "tools-private"
# _OPTION = "host_build"
+# _REQUIREMENTS = "qtConfig(qtattributionsscanner)"
# cmake_qattributionsscanner_config_file.input = "$$PWD/Qt5AttributionsScannerTools.cmake.in"
# cmake_qattributionsscanner_config_file.output = "$$MODULE_BASE_OUTDIR/lib/cmake/Qt5AttributionsScannerTools/Qt5AttributionsScannerToolsConfig.cmake"
# cmake_qattributionsscanner_config_version_file.input = "$$[QT_HOST_DATA/src]/mkspecs/features/data/cmake/Qt5ConfigVersion.cmake.in"
diff --git a/src/qtattributionsscanner/CMakeLists.txt b/src/qtattributionsscanner/CMakeLists.txt
index bee6df30..aef9be70 100644
--- a/src/qtattributionsscanner/CMakeLists.txt
+++ b/src/qtattributionsscanner/CMakeLists.txt
@@ -4,7 +4,9 @@
## qtattributionsscanner Tool:
#####################################################################
-qt_add_tool(qtattributionsscanner
+qt_get_tool_target_name(target_name qtattributionsscanner)
+qt_add_tool(${target_name}
+ TARGET_DESCRIPTION "Qt Source Code Attribution Scanner"
TOOLS_TARGET Tools # special case
SOURCES
jsongenerator.cpp jsongenerator.h
@@ -29,7 +31,9 @@ qt_add_tool(qtattributionsscanner
# INSTALLS = "cmake_qattributionsscanner_tools_files"
# QMAKE_SUBSTITUTES = "cmake_qattributionsscanner_config_file" "cmake_qattributionsscanner_config_version_file"
# QMAKE_TARGET_DESCRIPTION = "Qt Source Code Attribution Scanner"
+# QT_FOR_CONFIG = "tools-private"
# _OPTION = "host_build"
+# _REQUIREMENTS = "qtConfig(qtattributionsscanner)"
# cmake_qattributionsscanner_config_file.input = "$$PWD/Qt5AttributionsScannerTools.cmake.in"
# cmake_qattributionsscanner_config_file.output = "$$MODULE_BASE_OUTDIR/lib/cmake/Qt5AttributionsScannerTools/Qt5AttributionsScannerToolsConfig.cmake"
# cmake_qattributionsscanner_config_version_file.input = "$$[QT_HOST_DATA/src]/mkspecs/features/data/cmake/Qt5ConfigVersion.cmake.in"
diff --git a/src/windeployqt/.prev_CMakeLists.txt b/src/windeployqt/.prev_CMakeLists.txt
index b80096eb..e317a64e 100644
--- a/src/windeployqt/.prev_CMakeLists.txt
+++ b/src/windeployqt/.prev_CMakeLists.txt
@@ -4,8 +4,10 @@
## windeployqt Tool:
#####################################################################
-qt_add_tool(windeployqt
+qt_get_tool_target_name(target_name windeployqt)
+qt_add_tool(${target_name}
BOOTSTRAP
+ TARGET_DESCRIPTION "Qt Windows Deployment Tool"
SOURCES
../shared/winutils/elfreader.cpp ../shared/winutils/elfreader.h
../shared/winutils/qmlutils.cpp ../shared/winutils/qmlutils.h
@@ -23,17 +25,19 @@ qt_add_tool(windeployqt
#### Keys ignored in scope 1:.:.:windeployqt.pro:<TRUE>:
# QMAKE_TARGET_DESCRIPTION = "Qt Windows Deployment Tool"
+# QT_FOR_CONFIG = "tools-private"
# _OPTION = "host_build"
+# _REQUIREMENTS = "qtConfig(windeployqt)"
## Scopes:
#####################################################################
-qt_extend_target(windeployqt CONDITION WIN32
+qt_extend_target(${target_name} CONDITION WIN32
PUBLIC_LIBRARIES
shlwapi
)
-qt_extend_target(windeployqt CONDITION QT_FEATURE_relocatable
+qt_extend_target(${target_name} CONDITION QT_FEATURE_relocatable
DEFINES
QT_RELOCATABLE
)
diff --git a/src/windeployqt/CMakeLists.txt b/src/windeployqt/CMakeLists.txt
index f2ae3b51..25c7565b 100644
--- a/src/windeployqt/CMakeLists.txt
+++ b/src/windeployqt/CMakeLists.txt
@@ -4,8 +4,10 @@
## windeployqt Tool:
#####################################################################
-qt_add_tool(windeployqt
- #BOOTSTRAP # special case remove
+qt_get_tool_target_name(target_name windeployqt)
+qt_add_tool(${target_name}
+ BOOTSTRAP
+ TARGET_DESCRIPTION "Qt Windows Deployment Tool"
SOURCES
../shared/winutils/elfreader.cpp ../shared/winutils/elfreader.h
../shared/winutils/qmlutils.cpp ../shared/winutils/qmlutils.h
@@ -24,17 +26,19 @@ qt_add_tool(windeployqt
#### Keys ignored in scope 1:.:.:windeployqt.pro:<TRUE>:
# QMAKE_TARGET_DESCRIPTION = "Qt Windows Deployment Tool"
+# QT_FOR_CONFIG = "tools-private"
# _OPTION = "host_build"
+# _REQUIREMENTS = "qtConfig(windeployqt)"
## Scopes:
#####################################################################
-qt_extend_target(windeployqt CONDITION WIN32
+qt_extend_target(${target_name} CONDITION WIN32
PUBLIC_LIBRARIES
shlwapi
)
-qt_extend_target(windeployqt CONDITION QT_FEATURE_relocatable
+qt_extend_target(${target_name} CONDITION QT_FEATURE_relocatable
DEFINES
QT_RELOCATABLE
)
diff --git a/src/winrtrunner/CMakeLists.txt b/src/winrtrunner/CMakeLists.txt
index 736e4bba..304b67e2 100644
--- a/src/winrtrunner/CMakeLists.txt
+++ b/src/winrtrunner/CMakeLists.txt
@@ -4,8 +4,10 @@
## winrtrunner Tool:
#####################################################################
-qt_add_tool(winrtrunner
+qt_get_tool_target_name(target_name winrtrunner)
+qt_add_tool(${target_name}
BOOTSTRAP
+ TARGET_DESCRIPTION "Qt WinRT Runner"
SOURCES
../shared/corecon/ccapi.h
../shared/corecon/ccapi_11.h
@@ -38,4 +40,6 @@ qt_add_tool(winrtrunner
#### Keys ignored in scope 1:.:.:winrtrunner.pro:<TRUE>:
# QMAKE_TARGET_DESCRIPTION = "Qt WinRT Runner"
+# QT_FOR_CONFIG = "tools-private"
# _OPTION = "host_build"
+# _REQUIREMENTS = "qtConfig(winrtrunner)"
--
2.25.1

68
recipes-qt/qt6/qttools/0001-Use-correct-install-location-for-example-plugins.patch Normal file
View File

@ -0,0 +1,68 @@
From a5fc59d93d3b08805750c538a92e55255f9c45d8 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Thu, 4 Jun 2020 11:55:36 +0300
Subject: [PATCH] Use correct install location for example plugins
Change-Id: I5bc782d9c6dcfb205872b4f72182758214ff59f7
---
examples/designer/containerextension/CMakeLists.txt | 2 +-
examples/designer/customwidgetplugin/CMakeLists.txt | 2 +-
examples/designer/taskmenuextension/CMakeLists.txt | 2 +-
examples/designer/worldtimeclockplugin/CMakeLists.txt | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/examples/designer/containerextension/CMakeLists.txt b/examples/designer/containerextension/CMakeLists.txt
index fa7080ea..ec6f0af9 100644
--- a/examples/designer/containerextension/CMakeLists.txt
+++ b/examples/designer/containerextension/CMakeLists.txt
@@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)
set(CMAKE_AUTOUIC ON)
-set(INSTALL_EXAMPLEDIR "plugins/designer") # special case
+set(INSTALL_EXAMPLEDIR "${INSTALL_PLUGINSDIR}/designer") # special case
find_package(Qt6 COMPONENTS Core)
find_package(Qt6 COMPONENTS Gui)
diff --git a/examples/designer/customwidgetplugin/CMakeLists.txt b/examples/designer/customwidgetplugin/CMakeLists.txt
index c9232a2c..286aa72d 100644
--- a/examples/designer/customwidgetplugin/CMakeLists.txt
+++ b/examples/designer/customwidgetplugin/CMakeLists.txt
@@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)
set(CMAKE_AUTOUIC ON)
-set(INSTALL_EXAMPLEDIR "plugins/designer") # special case
+set(INSTALL_EXAMPLEDIR "${INSTALL_PLUGINSDIR}/designer") # special case
find_package(Qt6 COMPONENTS Core)
find_package(Qt6 COMPONENTS Gui)
diff --git a/examples/designer/taskmenuextension/CMakeLists.txt b/examples/designer/taskmenuextension/CMakeLists.txt
index 2ed6c4fe..ce684ff8 100644
--- a/examples/designer/taskmenuextension/CMakeLists.txt
+++ b/examples/designer/taskmenuextension/CMakeLists.txt
@@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)
set(CMAKE_AUTOUIC ON)
-set(INSTALL_EXAMPLEDIR "plugins/designer") # special case
+set(INSTALL_EXAMPLEDIR "${INSTALL_PLUGINSDIR}/designer") # special case
find_package(Qt6 COMPONENTS Core)
find_package(Qt6 COMPONENTS Gui)
diff --git a/examples/designer/worldtimeclockplugin/CMakeLists.txt b/examples/designer/worldtimeclockplugin/CMakeLists.txt
index 191f148b..5cf19af2 100644
--- a/examples/designer/worldtimeclockplugin/CMakeLists.txt
+++ b/examples/designer/worldtimeclockplugin/CMakeLists.txt
@@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)
set(CMAKE_AUTOUIC ON)
-set(INSTALL_EXAMPLEDIR "plugins/designer") # special case
+set(INSTALL_EXAMPLEDIR "${INSTALL_PLUGINSDIR}/designer") # special case
find_package(Qt6 COMPONENTS Core)
find_package(Qt6 COMPONENTS Gui)
--
2.25.1

4
recipes-qt/qt6/qttools_git.bb
View File

@ -15,8 +15,10 @@ include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtdeclarative qttools-native"
SRC_URI += "\
file://0001-Regenerate-CMakeLists.patch \
file://0001-Use-correct-install-location-for-example-plugins.patch \
"
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "2495c48a93fe0771ee59777a47071d19062d9e4a"
SRCREV = "30240c68c2c133c464460534081b865344a692ad"

2
recipes-qt/qt6/qttranslations_git.bb
View File

@ -18,4 +18,4 @@ python populate_packages_prepend () {
'Qt translations for %s', extra_depends='')
}
SRCREV = "e30abf5b4bc6bac19c78610ca80defc4daa629f5"
SRCREV = "920bbe8a055d479896fdcc9b704284e76519b147"

42
recipes-qt/qt6/qtwayland/0001-Regenerate-CMakeLists.patch Normal file
View File

@ -0,0 +1,42 @@
From 8ddd91b1247000c177cd5e874b5777bdb94ab461 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Tue, 2 Jun 2020 12:28:47 +0300
Subject: [PATCH] Regenerate CMakeLists
Change-Id: I09a799d0efb6fd9fe8d6ff6b98d39aea62a4bc2d
---
src/qtwaylandscanner/.prev_CMakeLists.txt | 3 ++-
src/qtwaylandscanner/CMakeLists.txt | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/qtwaylandscanner/.prev_CMakeLists.txt b/src/qtwaylandscanner/.prev_CMakeLists.txt
index bb413544..baa16eae 100644
--- a/src/qtwaylandscanner/.prev_CMakeLists.txt
+++ b/src/qtwaylandscanner/.prev_CMakeLists.txt
@@ -4,7 +4,8 @@
## qtwaylandscanner Tool:
#####################################################################
-qt_add_tool(qtwaylandscanner
+qt_get_tool_target_name(target_name qtwaylandscanner)
+qt_add_tool(${target_name}
SOURCES
qtwaylandscanner.cpp
PUBLIC_LIBRARIES
diff --git a/src/qtwaylandscanner/CMakeLists.txt b/src/qtwaylandscanner/CMakeLists.txt
index 17254afc..74acf341 100644
--- a/src/qtwaylandscanner/CMakeLists.txt
+++ b/src/qtwaylandscanner/CMakeLists.txt
@@ -4,7 +4,8 @@
## qtwaylandscanner Tool:
#####################################################################
-qt_add_tool(qtwaylandscanner
+qt_get_tool_target_name(target_name qtwaylandscanner)
+qt_add_tool(${target_name}
TOOLS_TARGET WaylandScanner # special case
SOURCES
qtwaylandscanner.cpp
--
2.25.1

3
recipes-qt/qt6/qtwayland_git.bb
View File

@ -14,6 +14,7 @@ include recipes-qt/qt6/qt6.inc
SRC_URI +="\
file://0001-Allow-qtwaylandscanner-to-be-built-without-dependenc.patch \
file://0001-Regenerate-CMakeLists.patch \
"
PACKAGECONFIG ?= "\
@ -37,4 +38,4 @@ DEPENDS += "qtbase qtdeclarative qtwayland-native wayland wayland-native"
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "dcd0aa6b31623ee6e2ef50a3c5aaef7054f8d6a9"
SRCREV = "c6c174dffc0a4d991c5cdb0fbbd05e4f2209e4c5"