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

update submodules

Browse Source
This commit is contained in:
Samuli Piippo 2020-08-03 10:57:49 +03:00
parent e98deb5dcc
commit 44c6f04c7f
35 changed files with 549 additions and 1332 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,6 +21,6 @@ PACKAGECONFIG_class-target ?= "system-assimp"
PACKAGECONFIG[system-assimp] = "-DFEATURE_system_assimp=ON,-DQT_FEATURE_system_assimp=OFF,assimp"
PACKAGECONFIG[qtgamepad] = ",,qtgamepad"
SRCREV_qt3d = "d4b5df43eae18b07d75e7da422ef635bbc636b7f"
SRCREV_assimp = "8840449226888801f64394fe8abe7f1b0372d499"
SRCREV_qt3d = "c9335062126a65dcaad6c43f24bb6a90db0e0cba"
SRCREV_assimp = "4e5017df696cf92301e75b200927c8c0dbeeb56d"
SRCREV_FORMAT = "qt3d_assimp"

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

@ -15,4 +15,4 @@ include recipes-qt/qt6/qt6-git.inc
DEPENDS += "qtbase"
SRCREV = "83aba0bb39ec55c988bd89d45bc7e066f529cd08"
SRCREV = "e2d462fee3c2741c16bb4580589a5b5c5eecae53"

32
recipes-qt/qt6/qtbase/0001-Define-QEvdevKeyMapper-even-without-opengl.patch Normal file
View File

@ -0,0 +1,32 @@
From b30c3d579977dada5637cad03a246f68b9fcf45a Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Mon, 3 Aug 2020 15:28:36 +0300
Subject: [PATCH] Define platform interfaces also without opengl
Fix build without opengl.
Change-Id: I691fd4112d69b16690915fcf33f5ae30ca2d7a93
---
src/gui/platform/unix/qunixplatforminterface.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/gui/platform/unix/qunixplatforminterface.cpp b/src/gui/platform/unix/qunixplatforminterface.cpp
index dc8daab217..55650e3efc 100644
--- a/src/gui/platform/unix/qunixplatforminterface.cpp
+++ b/src/gui/platform/unix/qunixplatforminterface.cpp
@@ -83,6 +83,8 @@ QOpenGLContext *QPlatformInterface::QEGLContext::fromNative(EGLContext context,
}
#endif
+#endif // QT_NO_OPENGL
+
#if QT_CONFIG(xcb)
QT_DEFINE_PRIVATE_PLATFORM_INTERFACE(QXcbScreen);
QT_DEFINE_PRIVATE_PLATFORM_INTERFACE(QXcbWindow);
@@ -102,6 +104,4 @@ QEvdevKeyMapper *QKeyMapper::platformInterface<QEvdevKeyMapper>() const
}
#endif
-#endif // QT_NO_OPENGL
-
QT_END_NAMESPACE

41
recipes-qt/qt6/qtbase/0001-Use-std-memmove.patch
View File

@ -1,41 +0,0 @@
From 4825c4e8226d05a52b1e116d9521ea2f2e09e392 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Mon, 29 Jun 2020 14:37:55 +0300
Subject: [PATCH] Use std::memmove
... and add include for it.
Amends ffb73175e6c5b35e6367c88479cc0bf160482016
Change-Id: I709a5aed13f6f62017b9e4116a03a4dfaae4bb13
---
src/corelib/tools/qcontainertools_impl.h | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/corelib/tools/qcontainertools_impl.h b/src/corelib/tools/qcontainertools_impl.h
index b43c3bb1c4..44cfdc444e 100644
--- a/src/corelib/tools/qcontainertools_impl.h
+++ b/src/corelib/tools/qcontainertools_impl.h
@@ -49,6 +49,7 @@
#include <QtCore/qglobal.h>
#include <QtCore/qtypeinfo.h>
+#include <cstring>
#include <iterator>
#include <memory>
@@ -62,9 +63,9 @@ void q_uninitialized_relocate_n(T* first, N n, T* out)
{
if constexpr (QTypeInfoQuery<T>::isRelocatable) {
if (n != N(0)) { // even if N == 0, out == nullptr or first == nullptr are UB for memmove()
- memmove(static_cast<void*>(out),
- static_cast<const void*>(first),
- n * sizeof(T));
+ std::memmove(static_cast<void*>(out),
+ static_cast<const void*>(first),
+ n * sizeof(T));
}
} else {
std::uninitialized_move_n(first, n, out);
--
2.25.1

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

@ -18,7 +18,7 @@ SRC_URI += "\
file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
file://0004-qtbase-allow-paths-outside-of-prefix.patch \
file://0005-Allow-build-without-opengl.patch \
file://0001-Use-std-memmove.patch \
file://0001-Define-QEvdevKeyMapper-even-without-opengl.patch \
"
DEPENDS += "\
@ -137,4 +137,4 @@ FILES_${PN}-tools += "\
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "f1638edf4599aa74be439873a7719d9b70c57f54"
SRCREV = "561da776c9f25c567167e0f813ee0c421a96c59f"

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

@ -19,4 +19,4 @@ PACKAGECONFIG[bluez] = "-DFEATURE_bluez=ON,-DFEATURE_bluez=OFF,bluez5"
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "fba18bb44a02a58794d3be8e49bddcffbd614f94"
SRCREV = "1bc4e378db9905727005ab23c972154bda3d6a68"

77
recipes-qt/qt6/qtdeclarative/0001-Fix-compilation-with-newer-qtbase.patch Normal file
View File

@ -0,0 +1,77 @@
From b7633a0005b78620fc57a9a869c1b82300e7978a Mon Sep 17 00:00:00 2001
From: Fabian Kosmale <fabian.kosmale@qt.io>
Date: Mon, 3 Aug 2020 08:49:37 +0200
Subject: [PATCH] Fix compilation with newer qtbase
qstrtod is no longer exported, but instead an inline function. This
replaces the existing forward declarations with an include of the
required private header.
Change-Id: I50bd32557c55dddcb197f163609fd7d5a1b2301b
---
src/qml/parser/qqmljslexer.cpp | 6 ++----
src/quick/items/context2d/qquickcontext2d.cpp | 3 +--
src/quick/util/qquicksvgparser.cpp | 4 ++--
3 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/src/qml/parser/qqmljslexer.cpp b/src/qml/parser/qqmljslexer.cpp
index 601596a9e3..c0ff69c6c4 100644
--- a/src/qml/parser/qqmljslexer.cpp
+++ b/src/qml/parser/qqmljslexer.cpp
@@ -43,16 +43,14 @@
#include <private/qqmljsdiagnosticmessage_p.h>
#include <private/qqmljsmemorypool_p.h>
+#include <private/qlocale_tools_p.h>
+
#include <QtCore/qcoreapplication.h>
#include <QtCore/qvarlengtharray.h>
#include <QtCore/qdebug.h>
#include <QtCore/QScopedValueRollback>
-QT_BEGIN_NAMESPACE
-Q_CORE_EXPORT double qstrtod(const char *s00, char const **se, bool *ok);
-QT_END_NAMESPACE
-
using namespace QQmlJS;
static inline int regExpFlagFromChar(const QChar &ch)
diff --git a/src/quick/items/context2d/qquickcontext2d.cpp b/src/quick/items/context2d/qquickcontext2d.cpp
index d705d08f71..5a7af4835e 100644
--- a/src/quick/items/context2d/qquickcontext2d.cpp
+++ b/src/quick/items/context2d/qquickcontext2d.cpp
@@ -68,6 +68,7 @@
#include <private/qv4functionobject_p.h>
#include <private/qv4objectproto_p.h>
#include <private/qv4scopedvalue_p.h>
+#include <private/qlocale_tools_p.h>
#include <QtCore/qmath.h>
#include <QtCore/qvector.h>
@@ -124,8 +125,6 @@ QT_BEGIN_NAMESPACE
-Q_CORE_EXPORT double qstrtod(const char *s00, char const **se, bool *ok);
-
#define CHECK_CONTEXT(r) if (!r || !r->d()->context() || !r->d()->context()->bufferValid()) \
THROW_GENERIC_ERROR("Not a Context2D object");
diff --git a/src/quick/util/qquicksvgparser.cpp b/src/quick/util/qquicksvgparser.cpp
index 0687913565..3e783b26a8 100644
--- a/src/quick/util/qquicksvgparser.cpp
+++ b/src/quick/util/qquicksvgparser.cpp
@@ -43,10 +43,10 @@
#include <QtCore/qvarlengtharray.h>
#include <QtCore/qstring.h>
+#include <private/qlocale_tools_p.h>
+
QT_BEGIN_NAMESPACE
-//copied from Qt SVG (qsvghandler.cpp).
-Q_CORE_EXPORT double qstrtod(const char *s00, char const **se, bool *ok);
// '0' is 0x30 and '9' is 0x39
static inline bool isDigit(ushort ch)
{

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

@ -1,633 +0,0 @@
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

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

@ -13,11 +13,11 @@ include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc
SRC_URI += "\
file://0001-Regenerate-CMakeLists.patch \
file://0001-Fix-compilation-with-newer-qtbase.patch \
"
DEPENDS += "qtbase qtdeclarative-native"
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "cde7835903812f6629ddcd6c8cdc91f2da195c9b"
SRCREV = "6826b2decc21cbf390076efa3a0d6c412563f94a"

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

@ -14,4 +14,4 @@ DEPENDS += "qtbase qtdeclarative qtquickcontrols2"
#PACKAGECONFIG ??= "sdl2"
PACKAGECONFIG[sdl2] = "-DFEATURE_sdl2=ON,-DFEATURE_sdl2=OFF,libsdl2"
SRCREV = "8213bc7dcfc054ddc7d45779ac1d5d1788e25d1f"
SRCREV = "5d9b4f172fb0c7115405a34fba10186aa100323d"

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

@ -1,10 +1,8 @@
LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 ) & ( GPL-2.0+ | LGPL-3.0 ) | The-Qt-Company-Commercial"
LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 ) | The-Qt-Company-Commercial"
LIC_FILES_CHKSUM = " \
file://LICENSE.BSD;md5=b2609ece79465e2b9eb9b94e80b03e5e \
file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
"
inherit qt6-cmake
@ -17,4 +15,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtdeclarative"
SRCREV = "47c046339daf207057d6451f96c29e723ddd1026"
SRCREV = "28282cde4474b45502ac3118df2ce7ded10a74b5"

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

@ -18,4 +18,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"
SRCREV = "c1881a3cf8cc38d6b90a9561caf3653c4731f597"
SRCREV = "8d0a048e7129618aab5c29423278218c33021be3"

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

@ -11,4 +11,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"
SRCREV = "fe8a4ab3eab4410023757dd1e29deea2554d18ad"
SRCREV = "433ffd705e5cb5728b77b5d37ae983f45989542e"

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

@ -24,7 +24,7 @@ _FILES_${PN}-qmlplugins += " \
${OE_QMAKE_PATH_QML}/QtQuick3D/Helpers/meshes/*.mesh \
"
SRCREV_qtquick3d = "016611be731a178e977e69369097b74b58e4a9df"
SRCREV_assimp = "8840449226888801f64394fe8abe7f1b0372d499"
SRCREV_qtquick3d = "d64c09c8669bd78bac2455f59b9a0d75f87204c7"
SRCREV_assimp = "4e5017df696cf92301e75b200927c8c0dbeeb56d"
SRCREV_FORMAT = "qtquick3d_assimp"

348
recipes-qt/qt6/qtquickcontrols2/0001-Fix-event-refactoring-warnings-and-errors.patch Normal file
View File

@ -0,0 +1,348 @@
From 9be87ece0b3fc412d244716247b64433bd5d0137 Mon Sep 17 00:00:00 2001
From: Mitch Curtis <mitch.curtis@qt.io>
Date: Fri, 17 Jul 2020 10:52:46 +0200
Subject: [PATCH] Fix event refactoring warnings and errors
Change-Id: I426b4f75066c9db72759398e4d76fd5323044d57
---
src/quicktemplates2/qquickcontrol.cpp | 28 ++++++++++----------
src/quicktemplates2/qquickdial.cpp | 10 +++----
src/quicktemplates2/qquickdrawer.cpp | 12 ++++-----
src/quicktemplates2/qquickoverlay.cpp | 12 ++++-----
src/quicktemplates2/qquickpopup.cpp | 8 +++---
src/quicktemplates2/qquickrangeslider.cpp | 8 +++---
src/quicktemplates2/qquickslider.cpp | 6 ++---
src/quicktemplates2/qquickswitch.cpp | 2 +-
src/quicktemplates2/qquickswitchdelegate.cpp | 2 +-
9 files changed, 44 insertions(+), 44 deletions(-)
diff --git a/src/quicktemplates2/qquickcontrol.cpp b/src/quicktemplates2/qquickcontrol.cpp
index 8463c60d..22b7f922 100644
--- a/src/quicktemplates2/qquickcontrol.cpp
+++ b/src/quicktemplates2/qquickcontrol.cpp
@@ -176,15 +176,15 @@ bool QQuickControlPrivate::acceptTouch(const QTouchEvent::TouchPoint &point)
if (point.id() == touchId)
return true;
- if (touchId == -1 && point.state() == Qt::TouchPointPressed) {
+ if (touchId == -1 && point.state() == QEventPoint::Pressed) {
touchId = point.id();
return true;
}
// If the control is on a Flickable that has a pressDelay, then the press is never
// sent as a touch event, therefore we need to check for this case.
- if (touchId == -1 && pressWasTouch && point.state() == Qt::TouchPointReleased &&
- point.pos() == previousPressPos) {
+ if (touchId == -1 && pressWasTouch && point.state() == QEventPoint::Released &&
+ point.position() == previousPressPos) {
return true;
}
return false;
@@ -1953,7 +1953,7 @@ void QQuickControl::hoverEnterEvent(QHoverEvent *event)
void QQuickControl::hoverMoveEvent(QHoverEvent *event)
{
Q_D(QQuickControl);
- setHovered(d->hoverEnabled && contains(event->pos()));
+ setHovered(d->hoverEnabled && contains(event->position()));
event->setAccepted(d->hoverEnabled);
}
@@ -1968,10 +1968,10 @@ void QQuickControl::hoverLeaveEvent(QHoverEvent *event)
void QQuickControl::mousePressEvent(QMouseEvent *event)
{
Q_D(QQuickControl);
- d->handlePress(event->localPos());
+ d->handlePress(event->position());
if (event->source() == Qt::MouseEventSynthesizedByQt) {
d->pressWasTouch = true;
- d->previousPressPos = event->localPos();
+ d->previousPressPos = event->position();
}
event->accept();
}
@@ -1979,14 +1979,14 @@ void QQuickControl::mousePressEvent(QMouseEvent *event)
void QQuickControl::mouseMoveEvent(QMouseEvent *event)
{
Q_D(QQuickControl);
- d->handleMove(event->localPos());
+ d->handleMove(event->position());
event->accept();
}
void QQuickControl::mouseReleaseEvent(QMouseEvent *event)
{
Q_D(QQuickControl);
- d->handleRelease(event->localPos());
+ d->handleRelease(event->position());
event->accept();
}
@@ -2009,14 +2009,14 @@ void QQuickControl::touchEvent(QTouchEvent *event)
continue;
switch (point.state()) {
- case Qt::TouchPointPressed:
- d->handlePress(point.pos());
+ case QEventPoint::Pressed:
+ d->handlePress(point.position());
break;
- case Qt::TouchPointMoved:
- d->handleMove(point.pos());
+ case QEventPoint::Updated:
+ d->handleMove(point.position());
break;
- case Qt::TouchPointReleased:
- d->handleRelease(point.pos());
+ case QEventPoint::Released:
+ d->handleRelease(point.position());
break;
default:
break;
diff --git a/src/quicktemplates2/qquickdial.cpp b/src/quicktemplates2/qquickdial.cpp
index 99bd0e98..e011891f 100644
--- a/src/quicktemplates2/qquickdial.cpp
+++ b/src/quicktemplates2/qquickdial.cpp
@@ -735,7 +735,7 @@ void QQuickDial::mousePressEvent(QMouseEvent *event)
{
Q_D(QQuickDial);
QQuickControl::mousePressEvent(event);
- d->handleMove(event->localPos());
+ d->handleMove(event->position());
setKeepMouseGrab(true);
}
@@ -750,18 +750,18 @@ void QQuickDial::touchEvent(QTouchEvent *event)
continue;
switch (point.state()) {
- case Qt::TouchPointMoved:
+ case QEventPoint::Updated:
if (!keepTouchGrab()) {
- bool overXDragThreshold = QQuickWindowPrivate::dragOverThreshold(point.pos().x() - d->pressPoint.x(), Qt::XAxis, &point);
+ bool overXDragThreshold = QQuickWindowPrivate::dragOverThreshold(point.position().x() - d->pressPoint.x(), Qt::XAxis, &point);
setKeepTouchGrab(overXDragThreshold);
if (!overXDragThreshold) {
- bool overYDragThreshold = QQuickWindowPrivate::dragOverThreshold(point.pos().y() - d->pressPoint.y(), Qt::YAxis, &point);
+ bool overYDragThreshold = QQuickWindowPrivate::dragOverThreshold(point.position().y() - d->pressPoint.y(), Qt::YAxis, &point);
setKeepTouchGrab(overYDragThreshold);
}
}
if (keepTouchGrab())
- d->handleMove(point.pos());
+ d->handleMove(point.position());
break;
default:
diff --git a/src/quicktemplates2/qquickdrawer.cpp b/src/quicktemplates2/qquickdrawer.cpp
index 433346ba..47b69161 100644
--- a/src/quicktemplates2/qquickdrawer.cpp
+++ b/src/quicktemplates2/qquickdrawer.cpp
@@ -305,7 +305,7 @@ bool QQuickDrawerPrivate::startDrag(QEvent *event)
switch (event->type()) {
case QEvent::MouseButtonPress:
- if (isWithinDragMargin(q, static_cast<QMouseEvent *>(event)->windowPos())) {
+ if (isWithinDragMargin(q, static_cast<QMouseEvent *>(event)->scenePosition())) {
prepareEnterTransition();
reposition();
return handleMouseEvent(window->contentItem(), static_cast<QMouseEvent *>(event));
@@ -316,7 +316,7 @@ bool QQuickDrawerPrivate::startDrag(QEvent *event)
case QEvent::TouchBegin:
case QEvent::TouchUpdate:
for (const QTouchEvent::TouchPoint &point : static_cast<QTouchEvent *>(event)->touchPoints()) {
- if (point.state() == Qt::TouchPointPressed && isWithinDragMargin(q, point.scenePos())) {
+ if (point.state() == QEventPoint::Pressed && isWithinDragMargin(q, point.scenePosition())) {
prepareEnterTransition();
reposition();
return handleTouchEvent(window->contentItem(), static_cast<QTouchEvent *>(event));
@@ -345,7 +345,7 @@ bool QQuickDrawerPrivate::grabMouse(QQuickItem *item, QMouseEvent *event)
if (!window || !interactive || keepGrab(popupItem) || keepGrab(item))
return false;
- const QPointF movePoint = event->windowPos();
+ const QPointF movePoint = event->scenePosition();
// Flickable uses a hard-coded threshold of 15 for flicking, and
// QStyleHints::startDragDistance for dragging. Drawer uses a bit
@@ -384,15 +384,15 @@ bool QQuickDrawerPrivate::grabTouch(QQuickItem *item, QTouchEvent *event)
Q_Q(QQuickDrawer);
bool handled = handleTouchEvent(item, event);
- if (!window || !interactive || keepGrab(popupItem) || keepGrab(item) || !event->touchPointStates().testFlag(Qt::TouchPointMoved))
+ if (!window || !interactive || keepGrab(popupItem) || keepGrab(item) || !event->touchPointStates().testFlag(QEventPoint::Updated))
return handled;
bool overThreshold = false;
for (const QTouchEvent::TouchPoint &point : event->touchPoints()) {
- if (!acceptTouch(point) || point.state() != Qt::TouchPointMoved)
+ if (!acceptTouch(point) || point.state() != QEventPoint::Updated)
continue;
- const QPointF movePoint = point.scenePos();
+ const QPointF movePoint = point.scenePosition();
// Flickable uses a hard-coded threshold of 15 for flicking, and
// QStyleHints::startDragDistance for dragging. Drawer uses a bit
diff --git a/src/quicktemplates2/qquickoverlay.cpp b/src/quicktemplates2/qquickoverlay.cpp
index 5cb1ab0b..4d272bff 100644
--- a/src/quicktemplates2/qquickoverlay.cpp
+++ b/src/quicktemplates2/qquickoverlay.cpp
@@ -217,16 +217,16 @@ bool QQuickOverlayPrivate::handleTouchEvent(QQuickItem *source, QTouchEvent *eve
case QEvent::TouchEnd:
for (const QTouchEvent::TouchPoint &point : event->touchPoints()) {
switch (point.state()) {
- case Qt::TouchPointPressed:
+ case QEventPoint::Pressed:
if (!target && startDrag(event, point.scenePosition()))
handled = true;
else
handled |= handlePress(source, event, target);
break;
- case Qt::TouchPointMoved:
+ case QEventPoint::Updated:
handled |= handleMove(source, event, target ? target : mouseGrabberPopup.data());
break;
- case Qt::TouchPointReleased:
+ case QEventPoint::Released:
handled |= handleRelease(source, event, target ? target : mouseGrabberPopup.data());
break;
default:
@@ -496,15 +496,15 @@ bool QQuickOverlay::eventFilter(QObject *object, QEvent *event)
case QEvent::TouchBegin:
case QEvent::TouchUpdate:
case QEvent::TouchEnd:
- if (static_cast<QTouchEvent *>(event)->touchPointStates() & Qt::TouchPointPressed)
+ if (static_cast<QTouchEvent *>(event)->touchPointStates() & QEventPoint::Pressed)
emit pressed();
- if (static_cast<QTouchEvent *>(event)->touchPointStates() & Qt::TouchPointReleased)
+ if (static_cast<QTouchEvent *>(event)->touchPointStates() & QEventPoint::Released)
emit released();
// allow non-modal popups to close on touch release outside
if (!d->mouseGrabberPopup) {
for (const QTouchEvent::TouchPoint &point : static_cast<QTouchEvent *>(event)->touchPoints()) {
- if (point.state() == Qt::TouchPointReleased) {
+ if (point.state() == QEventPoint::Released) {
if (d->handleRelease(d->window->contentItem(), event, nullptr))
break;
}
diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp
index 1d6f125e..57b93036 100644
--- a/src/quicktemplates2/qquickpopup.cpp
+++ b/src/quicktemplates2/qquickpopup.cpp
@@ -313,7 +313,7 @@ bool QQuickPopupPrivate::acceptTouch(const QTouchEvent::TouchPoint &point)
if (point.id() == touchId)
return true;
- if (touchId == -1 && point.state() != Qt::TouchPointReleased) {
+ if (touchId == -1 && point.state() != QEventPoint::Released) {
touchId = point.id();
return true;
}
@@ -395,11 +395,11 @@ bool QQuickPopupPrivate::handleTouchEvent(QQuickItem *item, QTouchEvent *event)
return blockInput(item, point.position());
switch (point.state()) {
- case Qt::TouchPointPressed:
+ case QEventPoint::Pressed:
return handlePress(item, item->mapToScene(point.position()), event->timestamp());
- case Qt::TouchPointMoved:
+ case QEventPoint::Updated:
return handleMove(item, item->mapToScene(point.position()), event->timestamp());
- case Qt::TouchPointReleased:
+ case QEventPoint::Released:
return handleRelease(item, item->mapToScene(point.position()), event->timestamp());
default:
break;
diff --git a/src/quicktemplates2/qquickrangeslider.cpp b/src/quicktemplates2/qquickrangeslider.cpp
index 2b0f2961..af95d463 100644
--- a/src/quicktemplates2/qquickrangeslider.cpp
+++ b/src/quicktemplates2/qquickrangeslider.cpp
@@ -458,7 +458,7 @@ bool QQuickRangeSliderPrivate::acceptTouch(const QTouchEvent::TouchPoint &point)
int firstId = QQuickRangeSliderNodePrivate::get(first)->touchId;
int secondId = QQuickRangeSliderNodePrivate::get(second)->touchId;
- if (((firstId == -1 || secondId == -1) && point.state() == Qt::TouchPointPressed) || point.id() == firstId || point.id() == secondId) {
+ if (((firstId == -1 || secondId == -1) && point.state() == QEventPoint::Pressed) || point.id() == firstId || point.id() == secondId) {
touchId = point.id();
return true;
}
@@ -1196,10 +1196,10 @@ void QQuickRangeSlider::touchEvent(QTouchEvent *event)
continue;
switch (point.state()) {
- case Qt::TouchPointPressed:
+ case QEventPoint::Pressed:
d->handlePress(point.position());
break;
- case Qt::TouchPointMoved:
+ case QEventPoint::Updated:
if (!keepTouchGrab()) {
if (d->orientation == Qt::Horizontal)
setKeepTouchGrab(QQuickWindowPrivate::dragOverThreshold(point.position().x() - point.pressPosition().x(), Qt::XAxis, &point, qRound(d->touchDragThreshold)));
@@ -1209,7 +1209,7 @@ void QQuickRangeSlider::touchEvent(QTouchEvent *event)
if (keepTouchGrab())
d->handleMove(point.position());
break;
- case Qt::TouchPointReleased:
+ case QEventPoint::Released:
d->handleRelease(point.position());
break;
default:
diff --git a/src/quicktemplates2/qquickslider.cpp b/src/quicktemplates2/qquickslider.cpp
index 9d223f25..dcff5420 100644
--- a/src/quicktemplates2/qquickslider.cpp
+++ b/src/quicktemplates2/qquickslider.cpp
@@ -805,10 +805,10 @@ void QQuickSlider::touchEvent(QTouchEvent *event)
continue;
switch (point.state()) {
- case Qt::TouchPointPressed:
+ case QEventPoint::Pressed:
d->handlePress(point.position());
break;
- case Qt::TouchPointMoved:
+ case QEventPoint::Updated:
if (!keepTouchGrab()) {
if (d->orientation == Qt::Horizontal)
setKeepTouchGrab(QQuickWindowPrivate::dragOverThreshold(point.position().x() - d->pressPoint.x(), Qt::XAxis, &point, qRound(d->touchDragThreshold)));
@@ -818,7 +818,7 @@ void QQuickSlider::touchEvent(QTouchEvent *event)
if (keepTouchGrab())
d->handleMove(point.position());
break;
- case Qt::TouchPointReleased:
+ case QEventPoint::Released:
d->handleRelease(point.position());
break;
default:
diff --git a/src/quicktemplates2/qquickswitch.cpp b/src/quicktemplates2/qquickswitch.cpp
index 2bba350d..143210ae 100644
--- a/src/quicktemplates2/qquickswitch.cpp
+++ b/src/quicktemplates2/qquickswitch.cpp
@@ -193,7 +193,7 @@ void QQuickSwitch::touchEvent(QTouchEvent *event)
Q_D(QQuickSwitch);
if (!keepTouchGrab() && event->type() == QEvent::TouchUpdate) {
for (const QTouchEvent::TouchPoint &point : event->touchPoints()) {
- if (point.id() != d->touchId || point.state() != Qt::TouchPointMoved)
+ if (point.id() != d->touchId || point.state() != QEventPoint::Updated)
continue;
if (d->canDrag(point.position()))
setKeepTouchGrab(QQuickWindowPrivate::dragOverThreshold(point.position().x() - d->pressPoint.x(), Qt::XAxis, &point));
diff --git a/src/quicktemplates2/qquickswitchdelegate.cpp b/src/quicktemplates2/qquickswitchdelegate.cpp
index 3300e252..2e196412 100644
--- a/src/quicktemplates2/qquickswitchdelegate.cpp
+++ b/src/quicktemplates2/qquickswitchdelegate.cpp
@@ -190,7 +190,7 @@ void QQuickSwitchDelegate::touchEvent(QTouchEvent *event)
Q_D(QQuickSwitchDelegate);
if (!keepTouchGrab() && event->type() == QEvent::TouchUpdate) {
for (const QTouchEvent::TouchPoint &point : event->touchPoints()) {
- if (point.id() != d->touchId || point.state() != Qt::TouchPointMoved)
+ if (point.id() != d->touchId || point.state() != QEventPoint::Updated)
continue;
if (d->canDrag(point.position()))
setKeepTouchGrab(QQuickWindowPrivate::dragOverThreshold(point.position().x() - d->pressPoint.x(), Qt::XAxis, &point));
--
2.17.1

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

@ -10,10 +10,14 @@ inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc
SRC_URI += "\
file://0001-Fix-event-refactoring-warnings-and-errors.patch \
"
DEPENDS = "qtbase qtdeclarative"
do_configure_prepend() {
sed -i -e 's/QmlTools//' ${S}/CMakeLists.txt
}
SRCREV = "d49bb8884d6d1a26fa4beb9ca2d4869db48368a5"
SRCREV = "49ffc6e6af83b295c67fd119b79c925879cc292e"

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

@ -11,4 +11,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS = "qtbase qtdeclarative"
SRCREV = "e6092511fc73674e8ae59ff897d47daa8bff6a4f"
SRCREV = "cfb1f2406f06103fbb8aa1c8f5213b7136ae52b5"

45
recipes-qt/qt6/qtremoteobjects/0001-Use-target_name.patch
View File

@ -1,45 +0,0 @@
From 44b03b1d4e8a9e69f3dbcf0dbb3ef10560ef5c0e Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Mon, 29 Jun 2020 12:44:04 +0300
Subject: [PATCH] Use target_name
Change-Id: I3b623944bbf6c9048d2c2715d544496b343480c2
---
tools/repc/CMakeLists.txt | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/tools/repc/CMakeLists.txt b/tools/repc/CMakeLists.txt
index bc34e22..e69a8ff 100644
--- a/tools/repc/CMakeLists.txt
+++ b/tools/repc/CMakeLists.txt
@@ -4,7 +4,8 @@
## repc Tool:
#####################################################################
-qt_add_tool(repc
+qt_get_tool_target_name(target_name repc)
+qt_add_tool(${target_name}
TOOLS_TARGET RemoteObjects # special case
SOURCES
cppcodegenerator.cpp cppcodegenerator.h
@@ -33,7 +34,7 @@ qt_add_tool(repc
# QLALR Grammars:
qt_process_qlalr(
- repc
+ ${target_name}
${CMAKE_SOURCE_DIR}/src/repparser/parser.g
""
)
@@ -45,7 +46,7 @@ qt_process_qlalr(
## Scopes:
#####################################################################
-qt_extend_target(repc CONDITION MSVC
+qt_extend_target(${target_name} CONDITION MSVC
COMPILE_OPTIONS
/wd4129
)
--
2.7.4

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

@ -11,12 +11,8 @@ inherit qt6-cmake
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc
SRC_URI =+ "\
file://0001-Use-target_name.patch \
"
DEPENDS += "qtbase qtdeclarative qtremoteobjects-native"
BBCLASSEXTEND += "native nativesdk"
SRCREV = "fdedca764c2aec80bc53490ce1380a441c8277c1"
SRCREV = "4514cea46087a51f25683f36e6fb5ee8069dde21"

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

@ -14,4 +14,4 @@ DEPENDS += "qtbase qtdeclarative qtscxml-native"
BBCLASSEXTEND += "native nativesdk"
SRCREV = "d765f71f3cf59a2eda1dca5215dda62b630cb202"
SRCREV = "98d5b12c39ea442f3826ac2cac345b9d5422f61a"

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

@ -15,4 +15,4 @@ DEPENDS += "qtbase qtserialport qtserialbus-native"
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "a733079f1e618ec4a3411e39ebdaeac10614b0ff"
SRCREV = "5d2a472ed30592d655e55545af4a778762e93b38"

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

@ -16,4 +16,4 @@ DEPENDS += "qtbase"
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "59f732d439bb2ad9fabf20be0686cce46700eaae"
SRCREV = "15cbfd5a0b3c729f1e5f2b456fb701c23fe3f898"

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

@ -1,42 +0,0 @@
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

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

@ -8,12 +8,8 @@ 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"
SRCREV = "16e53c81807d4c76e8f41bae3b7ffae8789405a7"
SRCREV = "348efeb67944de06cf162a4d5c221a9f524de17e"

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

@ -13,4 +13,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"
SRCREV = "79c928558887f68e7e4a356b3c313c0c155667ec"
SRCREV = "e03ad18db9a40590fa88cd2b10fa1b681f7ee2da"

476
recipes-qt/qt6/qttools/0001-Regenerate-CMakeLists.patch
View File

@ -1,476 +0,0 @@
From 9b4db5acdeb1d6b295f7cee38b496af310198192 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
---
src/assistant/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/qtattributionsscanner/.prev_CMakeLists.txt | 6 +++++-
src/qtattributionsscanner/CMakeLists.txt | 6 +++++-
src/windeployqt/CMakeLists.txt | 7 ++++---
src/winrtrunner/CMakeLists.txt | 6 +++++-
20 files changed, 81 insertions(+), 34 deletions(-)
diff --git a/src/assistant/qcollectiongenerator/.prev_CMakeLists.txt b/src/assistant/qcollectiongenerator/.prev_CMakeLists.txt
index ba927bd..cfbcfc0 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 cfd7cd9..97c8740 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 a9653d9..cbf8506 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 5f9afc5..540bb76 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 e65bc85..f01e77d 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 a5dee94..aba9464 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 2fb6df7..705b399 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 350b459..a2ed6ba 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 c196160..9669234 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 84db24f..e77fdd3 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 b0f636e..238b0e4 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 22e1dee..6c3542c 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 07f7af6..51f7b8c 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 c366a2d..8df52b7 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 61d7ad7..4df4d38 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 04515bb..fe2e08a 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/qtattributionsscanner/.prev_CMakeLists.txt b/src/qtattributionsscanner/.prev_CMakeLists.txt
index a7e7694..17cd648 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 bee6df3..aef9be7 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/CMakeLists.txt b/src/windeployqt/CMakeLists.txt
index ba6f454..9165cc1 100644
--- a/src/windeployqt/CMakeLists.txt
+++ b/src/windeployqt/CMakeLists.txt
@@ -4,7 +4,8 @@
## windeployqt Tool:
#####################################################################
-qt_add_executable(windeployqt # special case
+qt_get_tool_target_name(target_name windeployqt)
+qt_add_executable(${target_name} # special case
#BOOTSTRAP # special case remove
SOURCES
../shared/winutils/elfreader.cpp ../shared/winutils/elfreader.h
@@ -31,12 +32,12 @@ qt_add_executable(windeployqt # special case
## 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 736e4bb..304b67e 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.7.4

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

@ -14,10 +14,6 @@ include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtdeclarative qttools-native"
SRC_URI += "\
file://0001-Regenerate-CMakeLists.patch \
"
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "18b57308c6188b974771f91f703be348297ac475"
SRCREV = "819983972f3e8d7062c94d073b83ee7821a188ab"

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

@ -18,4 +18,4 @@ python populate_packages_prepend () {
'Qt translations for %s', extra_depends='')
}
SRCREV = "3005c2d20ad73b1e4cb743a5aeb3e1dd0f8adb81"
SRCREV = "810bd3fabb67e4f87d1518731708bb2e08ca38d8"

45
recipes-qt/qt6/qtvirtualkeyboard/0001-Remove-operator-for-QInputMethodEvent-Attribute.patch Normal file
View File

@ -0,0 +1,45 @@
From 5f3ceedc9c08a77aacb3c3e0b1d09afb61329be0 Mon Sep 17 00:00:00 2001
From: Mitch Curtis <mitch.curtis@qt.io>
Date: Wed, 29 Jul 2020 13:41:11 +0200
Subject: [PATCH] Remove operator== for QInputMethodEvent::Attribute
This was added to qtbase in 46ec92dad0f71c8d5e3260a67321d82054ea607e.
Task-number: QTBUG-85789
Change-Id: Ide246ba7bc75d4ef51d2c1f35172b64bece332c1
---
src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp | 8 --------
src/virtualkeyboard/shadowinputcontext.cpp | 1 -
2 files changed, 9 deletions(-)
diff --git a/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp b/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp
index 4365178..94c6283 100644
--- a/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp
+++ b/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp
@@ -44,14 +44,6 @@
QT_BEGIN_NAMESPACE
-bool operator==(const QInputMethodEvent::Attribute &attribute1, const QInputMethodEvent::Attribute &attribute2)
-{
- return attribute1.start == attribute2.start &&
- attribute1.length == attribute2.length &&
- attribute1.type == attribute2.type &&
- attribute1.value == attribute2.value;
-}
-
using namespace QtVirtualKeyboard;
const bool QtVirtualKeyboard::QT_VIRTUALKEYBOARD_FORCE_EVENTS_WITHOUT_FOCUS = qEnvironmentVariableIsSet("QT_VIRTUALKEYBOARD_FORCE_EVENTS_WITHOUT_FOCUS");
diff --git a/src/virtualkeyboard/shadowinputcontext.cpp b/src/virtualkeyboard/shadowinputcontext.cpp
index dc49f51..75fa479 100644
--- a/src/virtualkeyboard/shadowinputcontext.cpp
+++ b/src/virtualkeyboard/shadowinputcontext.cpp
@@ -36,7 +36,6 @@
#include <QQuickItem>
QT_BEGIN_NAMESPACE
-bool operator==(const QInputMethodEvent::Attribute &attribute1, const QInputMethodEvent::Attribute &attribute2);
namespace QtVirtualKeyboard {

6
recipes-qt/qt6/qtvirtualkeyboard_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-Remove-operator-for-QInputMethodEvent-Attribute.patch \
"
# To enabled Nuance T9 Write support, you need to provide the licensed components
# and enable "t9write" in PACKAGECONFIG. This can be done in a separate .bbappend file.
# for example:
@ -118,4 +122,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit"
DEPENDS += "qtbase qtdeclarative qtsvg qtdeclarative-native"
SRCREV = "e7228a680411ba6a6fcb7e59c6ad3c2c7143063a"
SRCREV = "e409ba186bcd670e7741740c410a32f35b1dbe2e"

17
recipes-qt/qt6/qtwayland/0001-Allow-qtwaylandscanner-to-be-built-without-dependenc.patch
View File

@ -1,4 +1,4 @@
From 00eba054654c8dd5f29fd8c98bfd4e8eafb59fce Mon Sep 17 00:00:00 2001
From 01785d3180c6f9b65f06a41a339992aa828aedda Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Wed, 29 Jan 2020 12:39:09 +0200
Subject: [PATCH] Allow qtwaylandscanner to be built without dependencies
@ -10,28 +10,29 @@ Change-Id: I15aa5fc5128fcd0925d5950596bd56710b5b81d4
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 340fe9e..cbf58a9 100644
index 88223a41..fe218863 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,10 +26,10 @@ endif()
@@ -26,11 +26,11 @@ endif()
find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS
Core
Gui
- OpenGL
PlatformHeaders
)
find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS
+ OpenGL
EglSupport
GlxSupport
LinuxAccessibilitySupport
Quick
)
# special case end
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ef145ed..df7b0ca 100644
index 8e60f0ba..4b2639e3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,7 +3,7 @@
qt_find_package(WaylandScanner PROVIDED_TARGETS Wayland::Scanner)
qt_find_package(Wayland PROVIDED_TARGETS Wayland::Client Wayland::Server)
qt_find_package(Wayland 1.15 PROVIDED_TARGETS Wayland::Client Wayland::Server)
-if (NOT WaylandScanner_FOUND OR NOT Wayland_FOUND)
+if ((QT_FEATURE_wayland_server OR QT_FEATURE_wayland_client) AND (NOT WaylandScanner_FOUND OR NOT Wayland_FOUND))

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

@ -1,42 +0,0 @@
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,7 +14,6 @@ include recipes-qt/qt6/qt6.inc
SRC_URI +="\
file://0001-Allow-qtwaylandscanner-to-be-built-without-dependenc.patch \
file://0001-Regenerate-CMakeLists.patch \
"
PACKAGECONFIG ?= "\
@ -38,4 +37,4 @@ DEPENDS += "qtbase qtdeclarative qtwayland-native wayland wayland-native"
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "b9dd052c47279848d474c47587c5995baf3a4c91"
SRCREV = "466a6da2a2667e780f96a461875573fc8e5964da"

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

@ -14,4 +14,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtdeclarative qtwebsockets"
SRCREV = "74f34a994eb511383748a566c0fb0541264b3a85"
SRCREV = "db70dab3c1b6ac099fc33b0aeb8de8b574073548"

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

@ -13,4 +13,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtdeclarative"
SRCREV = "788d4856330e6f5d251f9b153de3d22b8cf538f1"
SRCREV = "406fd60aa4ef1852eec6ae3b9cb5a724855d91e9"