diff --git a/recipes-qt/packagegroups/nativesdk-packagegroup-qt6-toolchain-host.bb b/recipes-qt/packagegroups/nativesdk-packagegroup-qt6-toolchain-host.bb index 69cd114..f6fb02e 100644 --- a/recipes-qt/packagegroups/nativesdk-packagegroup-qt6-toolchain-host.bb +++ b/recipes-qt/packagegroups/nativesdk-packagegroup-qt6-toolchain-host.bb @@ -14,8 +14,6 @@ RDEPENDS_${PN} += " \ nativesdk-qtbase-tools \ nativesdk-qtdeclarative-dev \ nativesdk-qtdeclarative-tools \ - nativesdk-qtremoteobjects-dev \ - nativesdk-qtremoteobjects-tools \ nativesdk-qttools-dev \ nativesdk-qttools-tools \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'nativesdk-qtwayland-dev nativesdk-qtwayland-tools', '', d)} \ diff --git a/recipes-qt/packagegroups/packagegroup-qt6-modules.bb b/recipes-qt/packagegroups/packagegroup-qt6-modules.bb index 71e5831..10f7c59 100644 --- a/recipes-qt/packagegroups/packagegroup-qt6-modules.bb +++ b/recipes-qt/packagegroups/packagegroup-qt6-modules.bb @@ -12,7 +12,6 @@ RDEPENDS_${PN} += " \ qt5compat \ qtbase \ qtcoap \ - qtconnectivity \ qtdeclarative \ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtgraphicaleffects', '', d)} \ qtimageformats \ @@ -22,7 +21,6 @@ RDEPENDS_${PN} += " \ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtquick3d', '', d)} \ qtquickcontrols2 \ qtquicktimeline \ - qtremoteobjects \ qtserialbus \ qtserialport \ qtshadertools \ @@ -32,6 +30,5 @@ RDEPENDS_${PN} += " \ qttranslations \ qtvirtualkeyboard \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland', '', d)} \ - qtwebchannel \ qtwebsockets \ " diff --git a/recipes-qt/packagegroups/packagegroup-qt6-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-qt6-toolchain-target.bb index 71a3710..2758504 100644 --- a/recipes-qt/packagegroups/packagegroup-qt6-toolchain-target.bb +++ b/recipes-qt/packagegroups/packagegroup-qt6-toolchain-target.bb @@ -13,7 +13,6 @@ RDEPENDS_${PN} += "\ qt5compat-dev \ qtbase-dev \ qtcoap-dev \ - qtconnectivity-dev \ qtdeclarative-dev \ qtgraphicaleffects-dev \ qtimageformats-dev \ @@ -24,7 +23,6 @@ RDEPENDS_${PN} += "\ qtquick3d-dev \ qtquickcontrols2-dev \ qtquicktimeline-dev \ - qtremoteobjects-dev \ qtserialbus-dev \ qtserialport-dev \ qtshadertools-dev \ @@ -34,6 +32,5 @@ RDEPENDS_${PN} += "\ qttranslations-dev \ qtvirtualkeyboard-dev \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland-dev', '', d)} \ - qtwebchannel-dev \ qtwebsockets-dev \ " diff --git a/recipes-qt/qt6/qtconnectivity_git.bb b/recipes-qt/qt6/qtconnectivity_git.bb deleted file mode 100644 index 4a3ed24..0000000 --- a/recipes-qt/qt6/qtconnectivity_git.bb +++ /dev/null @@ -1,20 +0,0 @@ -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" -LIC_FILES_CHKSUM = " \ - file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ - file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ - file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ - file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ -" - -inherit qt6-cmake - -include recipes-qt/qt6/qt6-git.inc -include recipes-qt/qt6/qt6.inc - -DEPENDS = "qtbase" - -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)}" -PACKAGECONFIG[bluez] = "-DFEATURE_bluez=ON,-DFEATURE_bluez=OFF,bluez5" - -SRCREV = "d9956f03dfc5768a4810a743f92d0a59ef4f3403" diff --git a/recipes-qt/qt6/qtgamepad_git.bb b/recipes-qt/qt6/qtgamepad_git.bb deleted file mode 100644 index f5580b1..0000000 --- a/recipes-qt/qt6/qtgamepad_git.bb +++ /dev/null @@ -1,17 +0,0 @@ -LICENSE = "GPL-3.0 | LGPL-3.0 | The-Qt-Company-Commercial" -LIC_FILES_CHKSUM = " \ - file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \ - file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ -" - -inherit qt6-qmake - -include recipes-qt/qt6/qt6-git.inc -include recipes-qt/qt6/qt6.inc - -DEPENDS += "qtbase qtdeclarative qtquickcontrols2" - -#PACKAGECONFIG ??= "sdl2" -PACKAGECONFIG[sdl2] = "-DFEATURE_sdl2=ON,-DFEATURE_sdl2=OFF,libsdl2" - -SRCREV = "5d9b4f172fb0c7115405a34fba10186aa100323d" diff --git a/recipes-qt/qt6/qtopcua_git.bb b/recipes-qt/qt6/qtopcua_git.bb index 5e32211..acbd89d 100644 --- a/recipes-qt/qt6/qtopcua_git.bb +++ b/recipes-qt/qt6/qtopcua_git.bb @@ -23,6 +23,6 @@ PACKAGECONFIG[examples] = "-DBUILD_EXAMPLES=ON,-DBUILD_EXAMPLES=OFF,,qtquickcont # cc1: error: -Wformat-security ignored without -Wformat [-Werror=format-security] SECURITY_STRINGFORMAT = "" -DEPENDS += "qtbase qtdeclarative qtremoteobjects-native" +DEPENDS += "qtbase qtdeclarative" SRCREV = "71a9fe798178633cc0b9a12d20ad7b609546d1e0" diff --git a/recipes-qt/qt6/qtremoteobjects_git.bb b/recipes-qt/qt6/qtremoteobjects_git.bb deleted file mode 100644 index b9470d4..0000000 --- a/recipes-qt/qt6/qtremoteobjects_git.bb +++ /dev/null @@ -1,18 +0,0 @@ -LICENSE = "BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 ) & ( GPL-2.0+ | LGPL-3.0 ) | The-Qt-Company-Commercial" -LIC_FILES_CHKSUM = " \ - file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ - file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ - file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ -" - -inherit qt6-cmake - -include recipes-qt/qt6/qt6-git.inc -include recipes-qt/qt6/qt6.inc - -DEPENDS += "qtbase qtdeclarative qtremoteobjects-native" - -BBCLASSEXTEND += "native nativesdk" - -SRCREV = "41b9a8f1ea833bc016486c7d1f835b2d6c67d4cd" diff --git a/recipes-qt/qt6/qtscxml/0001-Fix-compilation-after-string-data-changes-in-qtbase.patch b/recipes-qt/qt6/qtscxml/0001-Fix-compilation-after-string-data-changes-in-qtbase.patch deleted file mode 100644 index c94913e..0000000 --- a/recipes-qt/qt6/qtscxml/0001-Fix-compilation-after-string-data-changes-in-qtbase.patch +++ /dev/null @@ -1,113 +0,0 @@ -From 8be22a883cc9af0c7198fd298a790c7630290d39 Mon Sep 17 00:00:00 2001 -From: Simon Hausmann -Date: Fri, 24 Jan 2020 13:13:15 +0100 -Subject: [PATCH] Fix compilation after string data changes in qtbase - -Adjust the moc copied code to generate the same byte arrays for string -literals and simplified the unicode string tables to just store offsets -and size so that we can use QString::fromRawData (just like in -qtdeclarative). - -Change-Id: Id19c165454451192e0764b5d889a1275e92417ac -Reviewed-by: Ulf Hermann ---- - tools/qscxmlc/data.t | 10 ++++------ - tools/qscxmlc/generator.cpp | 13 +++++-------- - tools/qscxmlc/scxmlcppdumper.cpp | 4 ++-- - 3 files changed, 11 insertions(+), 16 deletions(-) - -diff --git a/tools/qscxmlc/data.t b/tools/qscxmlc/data.t -index 3926507..4bcb76b 100644 ---- a/tools/qscxmlc/data.t -+++ b/tools/qscxmlc/data.t -@@ -33,7 +33,9 @@ struct ${classname}::Data: private QScxmlTableData { - { - Q_ASSERT(id >= QScxmlExecutableContent::NoString); Q_ASSERT(id < ${stringCount}); - if (id == QScxmlExecutableContent::NoString) return QString(); -- return QString({static_cast(strings.data + id)}); -+ const auto dataOffset = strings.offsetsAndSize[id * 2]; -+ const auto dataSize = strings.offsetsAndSize[id * 2 + 1]; -+ return QString::fromRawData(reinterpret_cast(&strings.stringdata[dataOffset]), dataSize); - } - - const qint32 *stateMachineTable() const override final -@@ -82,7 +84,7 @@ struct ${classname}::Data: private QScxmlTableData { - static QScxmlExecutableContent::ForeachInfo foreaches[]; - static const qint32 theStateMachineTable[]; - static struct Strings { -- QArrayData data[${stringCount}]; -+ const uint offsetsAndSize[${stringCount} * 2]; - qunicodechar stringdata[${stringdataSize}]; - } strings; - }; -@@ -120,10 +122,6 @@ QScxmlExecutableContent::ForeachInfo ${classname}::Data::foreaches[] = { - ${foreaches} - }; - --#define STR_LIT(idx, ofs, len) \ -- Q_STATIC_STRING_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ -- qptrdiff(offsetof(Strings, stringdata) + ofs * sizeof(qunicodechar) - idx * sizeof(QArrayData)) \ -- ) - ${classname}::Data::Strings ${classname}::Data::strings = {{ - ${strLits} - },{ -diff --git a/tools/qscxmlc/generator.cpp b/tools/qscxmlc/generator.cpp -index 59047cf..220170a 100644 ---- a/tools/qscxmlc/generator.cpp -+++ b/tools/qscxmlc/generator.cpp -@@ -249,7 +249,7 @@ void Generator::generateCode() - // - const int constCharArraySizeLimit = 65535; - fprintf(out, "struct qt_meta_stringdata_%s_t {\n", qualifiedClassNameIdentifier.constData()); -- fprintf(out, " QByteArrayData data[%d];\n", strings.size()); -+ fprintf(out, " const uint offsetsAndSize[%d];\n", strings.size()*2); - { - int stringDataLength = 0; - int stringDataCounter = 0; -@@ -273,11 +273,8 @@ void Generator::generateCode() - // stringdata.stringdata member, and 2) the stringdata.data index of the - // QByteArrayData being defined. This calculation relies on the - // QByteArrayData::data() implementation returning simply "this + offset". -- fprintf(out, "#define QT_MOC_LITERAL(idx, ofs, len) \\\n" -- " Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \\\n" -- " qptrdiff(offsetof(qt_meta_stringdata_%s_t, stringdata0) + ofs \\\n" -- " - idx * sizeof(QByteArrayData)) \\\n" -- " )\n", -+ fprintf(out, "#define QT_MOC_LITERAL(ofs, len) \\\n" -+ " uint(offsetof(qt_meta_stringdata_%s_t, stringdata0) + ofs), len \n", - qualifiedClassNameIdentifier.constData()); - - fprintf(out, "static const qt_meta_stringdata_%s_t qt_meta_stringdata_%s = {\n", -@@ -287,7 +284,7 @@ void Generator::generateCode() - int idx = 0; - for (int i = 0; i < strings.size(); ++i) { - const QByteArray &str = strings.at(i); -- fprintf(out, "QT_MOC_LITERAL(%d, %d, %d)", i, idx, str.length()); -+ fprintf(out, "QT_MOC_LITERAL(%d, %d)", idx, str.length()); - if (i != strings.size() - 1) - fputc(',', out); - const QByteArray comment = str.length() > 32 ? str.left(29) + "..." : str; -@@ -519,7 +516,7 @@ void Generator::generateCode() - fprintf(out, " { &%s::staticMetaObject, ", purestSuperClass.constData()); - else - fprintf(out, " { nullptr, "); -- fprintf(out, "qt_meta_stringdata_%s.data,\n" -+ fprintf(out, "qt_meta_stringdata_%s.offsetsAndSize,\n" - " qt_meta_data_%s, ", qualifiedClassNameIdentifier.constData(), - qualifiedClassNameIdentifier.constData()); - if (hasStaticMetaCall) -diff --git a/tools/qscxmlc/scxmlcppdumper.cpp b/tools/qscxmlc/scxmlcppdumper.cpp -index 1aca09e..fa6359e 100644 ---- a/tools/qscxmlc/scxmlcppdumper.cpp -+++ b/tools/qscxmlc/scxmlcppdumper.cpp -@@ -267,8 +267,8 @@ void generateTables(const GeneratedTableData &td, Replacements &replacements) - return QString(); - - const int length = strings.at(idx).size(); -- const QString str = QStringLiteral("STR_LIT(%1, %2, %3)").arg( -- QString::number(idx), QString::number(ucharCount), QString::number(length)); -+ const QString str = QStringLiteral("%1, %2").arg( -+ QString::number(ucharCount), QString::number(length)); - ucharCount += length + 1; - return str; - }); diff --git a/recipes-qt/qt6/qtscxml_git.bb b/recipes-qt/qt6/qtscxml_git.bb deleted file mode 100644 index 37c9970..0000000 --- a/recipes-qt/qt6/qtscxml_git.bb +++ /dev/null @@ -1,17 +0,0 @@ -LICENSE = "LGPL-3.0 & BSD & GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial" -LIC_FILES_CHKSUM = " \ - file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ - file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ - file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ -" - -inherit qt6-qmake - -include recipes-qt/qt6/qt6-git.inc -include recipes-qt/qt6/qt6.inc - -DEPENDS += "qtbase qtdeclarative qtscxml-native" - -BBCLASSEXTEND += "native nativesdk" - -SRCREV = "2427b675711119c6aac68b662434eb8a0910c3a3" diff --git a/recipes-qt/qt6/qtwebchannel_git.bb b/recipes-qt/qt6/qtwebchannel_git.bb deleted file mode 100644 index f2fb8ad..0000000 --- a/recipes-qt/qt6/qtwebchannel_git.bb +++ /dev/null @@ -1,17 +0,0 @@ -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" -LIC_FILES_CHKSUM = " \ - 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-qmake - -include recipes-qt/qt6/qt6-git.inc -include recipes-qt/qt6/qt6.inc - -DEPENDS += "qtbase qtdeclarative qtwebsockets" - -SRCREV = "a1d717d881f6f1e72cf2643826b6025c1d16d7f6"