pool/gammaray
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Add patches to fix build against Qt 5.12:

Browse Source 
* fix-build-qt-5.12-again.patch

OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/gammaray?expand=0&rev=34
This commit is contained in:
Fabian Vogt 2018-10-05 08:27:01 +00:00 committed by Git OBS Bridge
parent 8b356f5901
commit ce932df13b
3 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
fix-build-qt-5.12-again.patch Normal file
View File

@ -0,0 +1,27 @@
From d0c9f9c8a0c62c53812c25e5bd77119f214cd1f8 Mon Sep 17 00:00:00 2001
From: Volker Krause <volker.krause@kdab.com>
Date: Mon, 20 Aug 2018 13:47:35 +0200
Subject: [PATCH] Adapt to Qt 5.12 V4 identifier changes
---
plugins/qmlsupport/qmlcontextpropertyadaptor.cpp | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/plugins/qmlsupport/qmlcontextpropertyadaptor.cpp b/plugins/qmlsupport/qmlcontextpropertyadaptor.cpp
index 2c183f083..1c24eaa44 100644
--- a/plugins/qmlsupport/qmlcontextpropertyadaptor.cpp
+++ b/plugins/qmlsupport/qmlcontextpropertyadaptor.cpp
@@ -100,8 +100,13 @@ void QmlContextPropertyAdaptor::doSetObject(const ObjectInstance &oi)
QV4::IdentifierHashEntry *e = propNames.d->entries;
QV4::IdentifierHashEntry *end = e + propNames.d->alloc;
while (e < end) {
+#if QT_VERSION < QT_VERSION_CHECK(5, 12, 0)
if (e->identifier)
m_contextPropertyNames.push_back(e->identifier->string);
+#else
+ if (e->identifier.isValid())
+ m_contextPropertyNames.push_back(e->identifier.toQString());
+#endif
++e;
}
#else

3
gammaray.changes
View File

@ -1,8 +1,9 @@
-------------------------------------------------------------------
Fri Oct 5 08:01:34 UTC 2018 - fabian@ritter-vogt.de
- Add patch to fix build against Qt 5.12:
- Add patches to fix build against Qt 5.12:
* fix-build-qt-5.12.patch
* fix-build-qt-5.12-again.patch
-------------------------------------------------------------------
Thu Oct 4 12:19:52 UTC 2018 - fabian@ritter-vogt.de

1
gammaray.spec
View File

@ -29,6 +29,7 @@ Source: https://github.com/KDAB/GammaRay/releases/download/v%{version}/%
Patch0: Fix_icons_installation.patch
# PATCH-FIX-UPSTREAM
Patch1: fix-build-qt-5.12.patch
Patch2: fix-build-qt-5.12-again.patch
BuildRequires: binutils-devel
BuildRequires: cmake >= 2.8.11
BuildRequires: fdupes