diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2022-05-17 12:55:32 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2022-05-17 12:58:45 +0300 |
| commit | fd6aa331eb989fbc8d9da2fa195052b87bc10352 (patch) | |
| tree | d54f90562c711583ee5cfc452ef8f51708e918af | |
| parent | 4cd4717cd7a9de3f73acd542ce058a3a8b75a667 (diff) | |
| parent | 6b29b21775558eea1a3ef3007133f08849b61b00 (diff) | |
Merge remote-tracking branch 'upstream/master' into lts-5.15
changelog:
6b29b217 cinematicexperience: Fix file permissions for non-root user
79a7b990 libconnman-qt5: Apply operator patch also for gcc-12
Change-Id: Ia789945c32b74707d49ccff64319e1fcab1de32f
| -rw-r--r-- | recipes-connectivity/libconnman-qt/libconnman-qt5/0001-Add-missing-declarations-for-operator-overloads.patch | 2 | ||||
| -rw-r--r-- | recipes-qt/examples/cinematicexperience_1.0.bb | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/recipes-connectivity/libconnman-qt/libconnman-qt5/0001-Add-missing-declarations-for-operator-overloads.patch b/recipes-connectivity/libconnman-qt/libconnman-qt5/0001-Add-missing-declarations-for-operator-overloads.patch index 1f7ec0c8..5d69032e 100644 --- a/recipes-connectivity/libconnman-qt/libconnman-qt5/0001-Add-missing-declarations-for-operator-overloads.patch +++ b/recipes-connectivity/libconnman-qt/libconnman-qt5/0001-Add-missing-declarations-for-operator-overloads.patch @@ -21,7 +21,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> #include "marshalutils.h" -+#if defined(__clang__) && __clang_major__ >= 11 ++#if defined(__clang__) && __clang_major__ >= 11 || __GNUC__ >= 12 +Q_DBUS_EXPORT const QDBusArgument &operator>>(const QDBusArgument &a, RouteStructure &v); +Q_DBUS_EXPORT QDBusArgument &operator<<(QDBusArgument &a, const RouteStructure &v); +#endif diff --git a/recipes-qt/examples/cinematicexperience_1.0.bb b/recipes-qt/examples/cinematicexperience_1.0.bb index 992f8367..b2e6072f 100644 --- a/recipes-qt/examples/cinematicexperience_1.0.bb +++ b/recipes-qt/examples/cinematicexperience_1.0.bb @@ -24,10 +24,12 @@ RDEPENDS:${PN} = "liberation-fonts qtdeclarative-qmlplugins qtgraphicaleffects-q require recipes-qt/qt5/qt5.inc do_install() { - install -d ${D}${datadir}/${P} - install -m 0755 ${B}/Qt5_CinematicExperience ${D}${datadir}/${P} - cp -R --no-dereference --preserve=mode,links ${S}/content ${D}${datadir}/${P} - install -m 0644 ${S}/Qt5_CinematicExperience.qml ${D}${datadir}/${P} + install -d ${D}${datadir}/${P}/content/ ${D}${datadir}/${P}/content/images/ + install -m 0755 ${B}/Qt5_CinematicExperience ${D}${datadir}/${P}/Qt5_CinematicExperience + install -m 0644 ${S}/content/*.qml ${D}${datadir}/${P}/content/ + install -m 0644 ${S}/content/images/*.png ${D}${datadir}/${P}/content/images/ + install -m 0644 ${S}/content/images/*.xcf ${D}${datadir}/${P}/content/images/ + install -m 0644 ${S}/Qt5_CinematicExperience.qml ${D}${datadir}/${P}/Qt5_CinematicExperience.qml install -d ${D}${bindir} echo "#!/bin/sh" > ${D}${bindir}/Qt5_CinematicExperience |