grantlee: fix build with Qt 5.13

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2019-08-14 00:52:24 +02:00
parent 7e0e55309c
commit f8f9597e00
2 changed files with 35 additions and 0 deletions

View File

@@ -0,0 +1,34 @@
From 1b4f22431ae35dfd11f07a5ae88a1b4db3de2a85 Mon Sep 17 00:00:00 2001
From: Michael Pyne <mpyne@kde.org>
Date: Tue, 18 Dec 2018 17:47:21 -0500
Subject: [PATCH] Fix build with Qt 5.13 / GCC 8.2.
At this point Grantlee doesn't build for me because QList is an
incomplete type. I think the compiler is right to complain, so I fix by
including the appropriate header.
Fixes issue #47.
Upstream-Status: Applied [1]
[1] https://github.com/steveire/grantlee/commit/1b4f22431ae35dfd11f07a5ae88a1b4db3de2a85
---
templates/lib/lexer_p.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/templates/lib/lexer_p.h b/templates/lib/lexer_p.h
index 275aeea..1ae451a 100644
--- a/templates/lib/lexer_p.h
+++ b/templates/lib/lexer_p.h
@@ -24,7 +24,7 @@
#include "textprocessingmachine_p.h"
#include "token.h"
-template <typename T> class QList;
+#include <QList>
namespace Grantlee
{
--
2.21.0

View File

@@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
SRC_URI = " \
http://downloads.grantlee.org/${BPN}-${PV}.tar.gz \
file://0001-rework-qCWarning-to-fix-build-with-gcc-6.patch \
file://0002-Fix-build-with-Qt-5.13-GCC-8.2.patch \
"
SRC_URI[md5sum] = "57989ae9f7c113e682ef1713a6f1e92a"
SRC_URI[sha256sum] = "ea2e402466c74bb533eee2c7252209ec61cd93a5d236fecd625b4a0eb13a1478"