diff --git a/fix-build-qt-5.12-again.patch b/fix-build-qt-5.12-again.patch new file mode 100644 index 0000000..17a98a2 --- /dev/null +++ b/fix-build-qt-5.12-again.patch @@ -0,0 +1,27 @@ +From d0c9f9c8a0c62c53812c25e5bd77119f214cd1f8 Mon Sep 17 00:00:00 2001 +From: Volker Krause +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 diff --git a/gammaray.changes b/gammaray.changes index beba397..60d02a6 100644 --- a/gammaray.changes +++ b/gammaray.changes @@ -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 diff --git a/gammaray.spec b/gammaray.spec index 985e075..6dd8b95 100644 --- a/gammaray.spec +++ b/gammaray.spec @@ -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