11f8e36680
- Add upstream patches to fix build with Qt 5.12.4 and 5.13: * Adapt-to-Qt-5.13-changes-for-attached-property-handling.patch * Adapt-to-attached-property-changes-in-Qt-5.12.4.patch OBS-URL: https://build.opensuse.org/request/show/710431 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/gammaray?expand=0&rev=50
35 lines
1.1 KiB
Diff
35 lines
1.1 KiB
Diff
From 621dbd93feff3cc33d26e76b65dafc0fbd2d7ce4 Mon Sep 17 00:00:00 2001
|
|
From: Volker Krause <volker.krause@kdab.com>
|
|
Date: Mon, 13 May 2019 14:58:26 +0200
|
|
Subject: [PATCH] Adapt to Qt 5.13 changes for attached property handling
|
|
|
|
---
|
|
plugins/qmlsupport/qmlattachedpropertyadaptor.h | 6 ++++++
|
|
1 file changed, 6 insertions(+)
|
|
|
|
diff --git a/plugins/qmlsupport/qmlattachedpropertyadaptor.h b/plugins/qmlsupport/qmlattachedpropertyadaptor.h
|
|
index c35e0d812..2d402c93a 100644
|
|
--- a/plugins/qmlsupport/qmlattachedpropertyadaptor.h
|
|
+++ b/plugins/qmlsupport/qmlattachedpropertyadaptor.h
|
|
@@ -32,6 +32,8 @@
|
|
#include <core/propertyadaptor.h>
|
|
#include <core/propertyadaptorfactory.h>
|
|
|
|
+#include <qqmlprivate.h>
|
|
+
|
|
namespace GammaRay {
|
|
class QmlAttachedPropertyAdaptor : public PropertyAdaptor
|
|
{
|
|
@@ -47,7 +49,11 @@ class QmlAttachedPropertyAdaptor : public PropertyAdaptor
|
|
void doSetObject(const ObjectInstance &oi) override;
|
|
|
|
private:
|
|
+#if QT_VERSION >= QT_VERSION_CHECK(5, 13, 0)
|
|
+ QVector<QQmlAttachedPropertiesFunc> m_attachedTypes;
|
|
+#else
|
|
QVector<int> m_attachedTypes;
|
|
+#endif
|
|
};
|
|
|
|
/** QML attached property adaptor. */
|