From b690a43e4326cd9262a3ce2963949219624edd96 Mon Sep 17 00:00:00 2001 From: Sona Kurazyan Date: Mon, 24 Aug 2020 11:03:43 +0200 Subject: [PATCH] Fix compile error when including QtCore5Compat Fixes: QTBUG-86196 Change-Id: I48a103ee3b57d4505aaf67c3d76f7a2af1f4065b Reviewed-by: Karsten Heimrich --- src/core5/codecs/qtextcodec.h | 1 - src/core5/qcore5global.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core5/codecs/qtextcodec.h b/src/core5/codecs/qtextcodec.h index 15b7039..f539baa 100644 --- a/src/core5/codecs/qtextcodec.h +++ b/src/core5/codecs/qtextcodec.h @@ -44,7 +44,6 @@ #include #include -#include QT_REQUIRE_CONFIG(textcodec); diff --git a/src/core5/qcore5global.h b/src/core5/qcore5global.h index 84d7c80..b6921cb 100644 --- a/src/core5/qcore5global.h +++ b/src/core5/qcore5global.h @@ -41,6 +41,7 @@ #define QCORE5GLOBAL_H #include +#include QT_BEGIN_NAMESPACE