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
This commit is contained in:
Samuli Piippo 2020-06-09 15:34:01 +03:00
parent 4e5a282793
commit f3d3674837
18 changed files with 188 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,4 +15,4 @@ include recipes-qt/qt6/qt6-git.inc
DEPENDS += "qtbase"
SRCREV = "1b89298d25a4c575226bedaf7e1f2f49b1babc79"
SRCREV = "9291b33c7569287c54acca000ecb1a8d13922365"

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

@ -122,9 +122,6 @@ do_install_append() {
if [ ! -e ${D}/${QT6_INSTALL_MKSPECSDIR}/oe-device-extra.pri ]; then
touch ${D}/${QT6_INSTALL_MKSPECSDIR}/oe-device-extra.pri
fi
# confligs with qttools module cmake files
rm -rf ${D}${libdir}/cmake/Qt6Tools
}
do_install_append_class-nativesdk() {
@ -141,4 +138,4 @@ FILES_${PN}-tools += "\
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "654a3ad08e52dd84dac3a729e06458cfa568f6bb"
SRCREV = "85c1009dbbb73fc9bee5911d70cdd96469ad8270"

30
recipes-qt/qt6/qtdeclarative/0001-QSGRhiShaderEffectNode-is-available-only-with-opengl.patch Normal file
View File

@ -0,0 +1,30 @@
From 83f44da23305ab563454e6fd7e9f83e09508a227 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Tue, 9 Jun 2020 10:15:07 +0300
Subject: [PATCH] QSGRhiShaderEffectNode is available only with opengl
Fixes build without opengl
Change-Id: Ica5752c21567b730065ec6276a9016b3989f9d02
---
src/quick/items/qquickrendercontrol.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/quick/items/qquickrendercontrol.cpp b/src/quick/items/qquickrendercontrol.cpp
index f8d2d14fcb..972c4ce279 100644
--- a/src/quick/items/qquickrendercontrol.cpp
+++ b/src/quick/items/qquickrendercontrol.cpp
@@ -200,8 +200,8 @@ void QQuickRenderControlPrivate::windowDestroyed()
rc->invalidate();
QQuickWindowPrivate::get(window)->animationController.reset();
-#if QT_CONFIG(quick_shadereffect)
- QSGRhiShaderEffectNode::cleanupMaterialTypeCache();
+#if QT_CONFIG(quick_shadereffect) && QT_CONFIG(opengl)
+ QSGRhiShaderEffectNode::cleanupMaterialTypeCache();
#endif
window = nullptr;
}
--
2.25.1

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

@ -14,10 +14,11 @@ include recipes-qt/qt6/qt6.inc
SRC_URI += "\
file://0001-Regenerate-CMakeLists.patch \
file://0001-QSGRhiShaderEffectNode-is-available-only-with-opengl.patch \
"
DEPENDS += "qtbase qtdeclarative-native"
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "fedc75b518854ecf5ac2360cfc735f2b213d4a1f"
SRCREV = "6a48a81319b886c8a3f85e1eb024186b05d0f3af"

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

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

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

@ -18,4 +18,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"
SRCREV = "c75f5c0acfff3435b38a2ee96eabacf0c3feae94"
SRCREV = "c64f19516dd2467bf5746eb24afe883bdbc15b25"

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

@ -11,4 +11,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"
SRCREV = "8ad171f5074ee65b7017402110ef35107f9a7220"
SRCREV = "d526ac37c55c5573f19a85580880b428d6fca510"

2
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 = "1b7b167ede6ca8a19a8dd760458898f1c23abfc3"
SRCREV_qtquick3d = "837f84f17dbf76b1e24ba212c5e1abe34dffb2f1"
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 = "257054f2cc6d79e763a12b350ffcc18787d0ac8c"
SRCREV = "135327c494b00bbc9d0c4deffba92d55c08ea93f"

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

@ -16,4 +16,4 @@ DEPENDS = "qtbase qtshadertools-native"
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "d8aa3fb504723a2ebf54d0eae5c5e6b633826b3a"
SRCREV = "714331c8fe377d04ec43828fe03792609b8f006a"

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

@ -13,4 +13,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"
SRCREV = "f8f067f1d8fd9b07039f91df1c784ee25f71ef2b"
SRCREV = "74cf1f940c2f21c5e1dc01f8b57ddd7ea022aec1"

108
recipes-qt/qt6/qttools/0001-DesktopWidget-is-no-more.patch Normal file
View File

@ -0,0 +1,108 @@
From 0460bcf1b99ea640c2bb25e46c85c41f631c1dc6 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Tue, 9 Jun 2020 11:57:28 +0300
Subject: [PATCH] DesktopWidget is no more
Change-Id: Iaee232b831b46db43930b14e9b0dc9706e6d01eb
---
src/designer/src/designer/qdesigner_actions.cpp | 1 -
src/designer/src/lib/shared/deviceprofile.cpp | 3 +--
src/designer/src/lib/shared/newformwidget.cpp | 1 -
src/designer/src/lib/shared/selectsignaldialog.cpp | 1 -
src/linguist/linguist/mainwindow.cpp | 1 -
src/pixeltool/qpixeltool.cpp | 3 +--
6 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/src/designer/src/designer/qdesigner_actions.cpp b/src/designer/src/designer/qdesigner_actions.cpp
index cf404d51..e0a7d713 100644
--- a/src/designer/src/designer/qdesigner_actions.cpp
+++ b/src/designer/src/designer/qdesigner_actions.cpp
@@ -67,7 +67,6 @@
#include <QtWidgets/qmdisubwindow.h>
#include <QtWidgets/qpushbutton.h>
#include <QtWidgets/qstatusbar.h>
-#include <QtWidgets/qdesktopwidget.h>
#include <QtGui/qaction.h>
#include <QtGui/qactiongroup.h>
diff --git a/src/designer/src/lib/shared/deviceprofile.cpp b/src/designer/src/lib/shared/deviceprofile.cpp
index c2df77ff..a8a28118 100644
--- a/src/designer/src/lib/shared/deviceprofile.cpp
+++ b/src/designer/src/lib/shared/deviceprofile.cpp
@@ -34,7 +34,6 @@
#include <QtWidgets/qapplication.h>
#include <QtGui/qfont.h>
-#include <QtWidgets/qdesktopwidget.h>
#include <QtWidgets/qstyle.h>
#include <QtWidgets/qstylefactory.h>
#include <QtWidgets/qapplication.h>
@@ -202,7 +201,7 @@ void DeviceProfile::setName(const QString &n)
void DeviceProfile::systemResolution(int *dpiX, int *dpiY)
{
- const QDesktopWidget *dw = qApp->desktop();
+ const QWidget *dw = qApp->desktop();
*dpiX = dw->logicalDpiX();
*dpiY = dw->logicalDpiY();
}
diff --git a/src/designer/src/lib/shared/newformwidget.cpp b/src/designer/src/lib/shared/newformwidget.cpp
index f5cae7fc..bef69726 100644
--- a/src/designer/src/lib/shared/newformwidget.cpp
+++ b/src/designer/src/lib/shared/newformwidget.cpp
@@ -49,7 +49,6 @@
#include <QtCore/qtextstream.h>
#include <QtWidgets/qapplication.h>
-#include <QtWidgets/qdesktopwidget.h>
#include <QtWidgets/qheaderview.h>
#include <QtWidgets/qtreewidget.h>
#include <QtGui/qpainter.h>
diff --git a/src/designer/src/lib/shared/selectsignaldialog.cpp b/src/designer/src/lib/shared/selectsignaldialog.cpp
index f7308f0f..f19f86cd 100644
--- a/src/designer/src/lib/shared/selectsignaldialog.cpp
+++ b/src/designer/src/lib/shared/selectsignaldialog.cpp
@@ -38,7 +38,6 @@
#include "widgetdatabase_p.h"
#include <QtWidgets/qapplication.h>
-#include <QtWidgets/qdesktopwidget.h>
#include <QtWidgets/qpushbutton.h>
#include <QtGui/qstandarditemmodel.h>
#include <QtGui/qscreen.h>
diff --git a/src/linguist/linguist/mainwindow.cpp b/src/linguist/linguist/mainwindow.cpp
index 5f455815..06b2da9f 100644
--- a/src/linguist/linguist/mainwindow.cpp
+++ b/src/linguist/linguist/mainwindow.cpp
@@ -54,7 +54,6 @@
#include <QBitmap>
#include <QCloseEvent>
#include <QDebug>
-#include <QDesktopWidget>
#include <QDockWidget>
#include <QFile>
#include <QFileDialog>
diff --git a/src/pixeltool/qpixeltool.cpp b/src/pixeltool/qpixeltool.cpp
index a52a828c..97fd3d4c 100644
--- a/src/pixeltool/qpixeltool.cpp
+++ b/src/pixeltool/qpixeltool.cpp
@@ -29,7 +29,6 @@
#include "qpixeltool.h"
#include <qapplication.h>
-#include <qdesktopwidget.h>
#include <qdir.h>
#include <qapplication.h>
#include <qscreen.h>
@@ -534,7 +533,7 @@ void QPixelTool::grabScreen()
int y = mousePos.y() - h/2;
const QBrush darkBrush = palette().color(QPalette::Dark);
- const QDesktopWidget *desktopWidget = QApplication::desktop();
+ const QWidget *desktopWidget = QApplication::desktop();
if (QScreen *screen = this->screen()) {
m_buffer = screen->grabWindow(desktopWidget->winId(), x, y, w, h);
} else {
--
2.25.1

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

@ -1,34 +1,33 @@
From 4b2be44ed2a26fa2d2aa93c5ecbcb111587fd7df Mon Sep 17 00:00:00 2001
From 8bf14e84d21221c092fcd3234340a54692d47ec3 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(-)
.../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/CMakeLists.txt | 14 ++++++--------
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 +++++-
22 files changed, 98 insertions(+), 46 deletions(-)
diff --git a/src/assistant/qcollectiongenerator/.prev_CMakeLists.txt b/src/assistant/qcollectiongenerator/.prev_CMakeLists.txt
index ba927bd7..cfbcfc0a 100644
@ -372,70 +371,21 @@ index 04515bba..fe2e08a2 100644
-#### 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
index 6ba6c127..ac6c0c3b 100644
--- a/src/qdoc/CMakeLists.txt
+++ b/src/qdoc/CMakeLists.txt
@@ -4,7 +4,9 @@
@@ -4,7 +4,8 @@
## qdoc Tool:
#####################################################################
-qt_add_tool(qdoc
+qt_get_tool_target_name(target_name qdoc)
+qt_add_tool(${target_name}
+ TARGET_DESCRIPTION "Qt Documentation Compiler"
TARGET_DESCRIPTION "Qt Documentation Compiler"
TOOLS_TARGET Tools # special case
SOURCES
atom.cpp atom.h
@@ -89,12 +91,12 @@ qt_add_tool(qdoc
@@ -112,12 +113,12 @@ qt_add_tool(qdoc
#### Keys ignored in scope 2:.:.:qdoc.pro:NOT force_bootstrap:
# _REQUIREMENTS = "qtConfig(xmlstreamwriter)"
@ -450,7 +400,7 @@ index 456af22c..dc279cb5 100644
DEFINES
QT_NO_DECLARATIVE
)
@@ -102,7 +104,7 @@ qt_extend_target(qdoc CONDITION NOT TARGET Qt::QmlDevToolsPrivate
@@ -125,7 +126,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"
@ -459,10 +409,13 @@ index 456af22c..dc279cb5 100644
LINK_OPTIONS
"/STACK:4194304"
)
@@ -120,7 +122,7 @@ qt_extend_target(qdoc CONDITION win32-icc_x_ OR win32-msvc_x_
@@ -143,10 +144,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"
-
-#### Keys ignored in scope 12:.:.:qdoc.pro:QMAKE_HOST.os___equals___Windows:
-# CMAKE_BIN_SUFFIX = ".exe"
-qt_add_docs(qdoc
+qt_add_docs(${target_name}
doc/config/qdoc.qdocconf

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

@ -16,9 +16,9 @@ DEPENDS += "qtbase qtdeclarative qttools-native"
SRC_URI += "\
file://0001-Regenerate-CMakeLists.patch \
file://0001-Use-correct-install-location-for-example-plugins.patch \
file://0001-DesktopWidget-is-no-more.patch \
"
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "30240c68c2c133c464460534081b865344a692ad"
SRCREV = "58902fbd684d39191fbddf3ef5e917e709b38a68"

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

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

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

@ -118,4 +118,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit"
DEPENDS += "qtbase qtdeclarative qtsvg qtdeclarative-native"
SRCREV = "18a30053f3edcb1f65f6a174129299ecae9c5213"
SRCREV = "07fb3985aaa702c1bc72a4a724eef32041d68255"

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

@ -38,4 +38,4 @@ DEPENDS += "qtbase qtdeclarative qtwayland-native wayland wayland-native"
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "c6c174dffc0a4d991c5cdb0fbbd05e4f2209e4c5"
SRCREV = "cab749b614d1f5485c1d00204f1a14c81212eda9"

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

@ -13,4 +13,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtdeclarative"
SRCREV = "9486a8053edd0eab68a03178effebda0d5194607"
SRCREV = "891a007f6cb7c65f4c1b8087e99eefdcecd29eac"