From 4d43b995bf2d1f059704e45d64c38b3238cc64a3 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 6 Dec 2022 07:50:20 +0100 Subject: [PATCH] QLibraryInfo: undo the !__cplusplus protection again Now that C code need not include the header for qVersion() anymore, it's no longer needed. Partially reverts 50b05e3e2ad969abf4b939d5db2253380e47d775. Change-Id: I917fbc883c315a0878e08da6aca9aed29c29917f Reviewed-by: Fabian Kosmale Reviewed-by: Qt CI Bot Reviewed-by: Ivan Solovev Reviewed-by: Thiago Macieira --- src/corelib/global/qlibraryinfo.h | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h index dae050f9cc2..d4e8f8b0506 100644 --- a/src/corelib/global/qlibraryinfo.h +++ b/src/corelib/global/qlibraryinfo.h @@ -4,18 +4,12 @@ #ifndef QLIBRARYINFO_H #define QLIBRARYINFO_H -#if defined(__cplusplus) #include #include #include -#else -#include -#endif QT_BEGIN_NAMESPACE -#if defined(__cplusplus) - class Q_CORE_EXPORT QLibraryInfo { public: @@ -67,8 +61,6 @@ Q_CORE_EXPORT Q_DECL_CONST_FUNCTION bool qSharedBuild() noexcept; #endif -#endif // __cplusplus - QT_END_NAMESPACE #endif // QLIBRARYINFO_H