aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qt5-creator/0001-Fix-interface-of-propertyNameListForWritableProperti.patch
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2023-01-11 09:20:54 +0200
committerMikko Gronoff <mikko.gronoff@qt.io>2023-01-11 13:00:46 +0200
commit7b36bfcfaeac2c470a2bde9f96eac13434986154 (patch)
treec1ca107a7d4032e27bb29b4e7902c28371290643 /recipes-qt/qt5/qt5-creator/0001-Fix-interface-of-propertyNameListForWritableProperti.patch
parenta02581b881e2bc7026eba1db8a66dcfce1012ce2 (diff)
parent1d1b19ff577835bf847152eed44d52e8267d9093 (diff)
Merge remote-tracking branch 'qt/upstream/master' into lts-5.15
* Removed pyqtchart receipe from build as updated dependency (sip3 -> sip) is not present in meta-openembedded dunfell branch. * Removed Creator patch for API change that got fixed in updated creator revision. changelog: 1d1b19ff qtwebkit: Add packageconfig to build tools 88c8564e qtwebkit: Fix build with ruby 3.2+ b119822b qtpdf,qtwebengine: Fix build with 64bit time_t f1ac1203 qtbase: Fix build with 64bit time_t on glibc 8159b71f layer.conf: update LAYERSERIES_COMPAT for mickledore c22b8fac qt5-creator: bump SRCREV to fix compatibility with newer qt c555401f qtbase: add -DUSE_X11 Flag 2df0f760 qt5: upgrade to v5.15.7-lts-lgpl 1a917695 packagegroup-qt5-toolchain-target: Add qtquickcontrols2-qmlplugins RRECOMMENDS:${PN} 8363b198 qtbase-native: Reduce TMPDIR QA false positives for rcc generated files Task-number: QTBUG-109765 Change-Id: I97f2ef1f1d572768eacfd75e483ef341342c54bd
Diffstat (limited to 'recipes-qt/qt5/qt5-creator/0001-Fix-interface-of-propertyNameListForWritableProperti.patch')
-rw-r--r--recipes-qt/qt5/qt5-creator/0001-Fix-interface-of-propertyNameListForWritableProperti.patch53
1 files changed, 0 insertions, 53 deletions
diff --git a/recipes-qt/qt5/qt5-creator/0001-Fix-interface-of-propertyNameListForWritableProperti.patch b/recipes-qt/qt5/qt5-creator/0001-Fix-interface-of-propertyNameListForWritableProperti.patch
deleted file mode 100644
index 28fe7844..00000000
--- a/recipes-qt/qt5/qt5-creator/0001-Fix-interface-of-propertyNameListForWritableProperti.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From aa1f4a5dc09d8ded55384bd2172bea431ffa479c Mon Sep 17 00:00:00 2001
-From: Jani Suonpera <jani.suonpera@qt.io>
-Date: Wed, 15 Sep 2021 13:54:30 +0300
-Subject: [PATCH] Fix interface of propertyNameListForWritablePropertie
-
-There are show compiling error:
-Compiling error:
-|build/tmp/work/armv7vet2hf-neon-poky-linux-gnueabi/qt5-creator/4.15.0+gitAUTOINC+978f6caf1e-r0/git/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate_56.cpp: In function 'QmlDesigner::PropertyNameList QmlDesigner::Internal::QmlPrivateGate::propertyNameListForWritableProperties(QObject*, const PropertyName&, QObjectList*)':
-| build/tmp/work/armv7vet2hf-neon-poky-linux-gnueabi/qt5-creator/4.15.0+gitAUTOINC+978f6caf1e-r0/git/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate_56.cpp:156:117: error: no matching function for call to 'QQuickDesignerSupportProperties::propertyNameListForWritableProperties(QObject*&, const PropertyName&, QObjectList*&)'
-| 156 | return QQuickDesignerSupportProperties::propertyNameListForWritableProperties(object, baseName, inspectedObjects);
-
-This is cause of interface changes. There are drop out parameters
-baseName and inspectedObjects from
-QQuickDesignerSupportProperties::propertyNameListForWritableProperties.
-
----
- .../qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate.h | 4 +---
- .../qml/qmlpuppet/qmlprivategate/qmlprivategate_56.cpp | 6 ++----
- 2 files changed, 3 insertions(+), 7 deletions(-)
-
-diff --git a/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate.h b/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate.h
-index b0b68907ed..e600db3c60 100644
---- a/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate.h
-+++ b/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate.h
-@@ -68,9 +68,7 @@ public:
- QObject *createComponent(const QUrl &componentUrl, QQmlContext *context);
- void tweakObjects(QObject *object);
- bool isPropertyBlackListed(const QmlDesigner::PropertyName &propertyName);
-- PropertyNameList propertyNameListForWritableProperties(QObject *object,
-- const PropertyName &baseName = PropertyName(),
-- QObjectList *inspectedObjects = nullptr);
-+ PropertyNameList propertyNameListForWritableProperties(QObject *object);
- PropertyNameList allPropertyNames(QObject *object,
- const PropertyName &baseName = PropertyName(),
- QObjectList *inspectedObjects = nullptr);
-diff --git a/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate_56.cpp b/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate_56.cpp
-index 7e5af01944..b9d6b75596 100644
---- a/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate_56.cpp
-+++ b/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate_56.cpp
-@@ -149,11 +149,9 @@ PropertyNameList allPropertyNames(QObject *object,
- #endif
- }
-
--PropertyNameList propertyNameListForWritableProperties(QObject *object,
-- const PropertyName &baseName,
-- QObjectList *inspectedObjects)
-+PropertyNameList propertyNameListForWritableProperties(QObject *object)
- {
-- return QQuickDesignerSupportProperties::propertyNameListForWritableProperties(object, baseName, inspectedObjects);
-+ return QQuickDesignerSupportProperties::propertyNameListForWritableProperties(object);
- }
-
- void tweakObjects(QObject *object)