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
23 lines
919 B
Diff
23 lines
919 B
Diff
From 55c8b44e461fdfbc16efb3c76ea4e5030f60ec22 Mon Sep 17 00:00:00 2001
|
|
From: Volker Krause <volker.krause@kdab.com>
|
|
Date: Mon, 27 May 2019 15:00:53 +0200
|
|
Subject: [PATCH] Adapt to attached property changes in Qt 5.12.4
|
|
|
|
---
|
|
plugins/qmlsupport/qmlattachedpropertyadaptor.h | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/plugins/qmlsupport/qmlattachedpropertyadaptor.h b/plugins/qmlsupport/qmlattachedpropertyadaptor.h
|
|
index 2d402c93a..689d499fb 100644
|
|
--- a/plugins/qmlsupport/qmlattachedpropertyadaptor.h
|
|
+++ b/plugins/qmlsupport/qmlattachedpropertyadaptor.h
|
|
@@ -49,7 +49,7 @@ class QmlAttachedPropertyAdaptor : public PropertyAdaptor
|
|
void doSetObject(const ObjectInstance &oi) override;
|
|
|
|
private:
|
|
-#if QT_VERSION >= QT_VERSION_CHECK(5, 13, 0)
|
|
+#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 4)
|
|
QVector<QQmlAttachedPropertiesFunc> m_attachedTypes;
|
|
#else
|
|
QVector<int> m_attachedTypes;
|