diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2022-12-06 07:50:20 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2022-12-09 07:21:28 +0100 |
| commit | 4d43b995bf2d1f059704e45d64c38b3238cc64a3 (patch) | |
| tree | be546c5da88b64254e140319f567595bc2e9b4aa /src/corelib/global/qlibraryinfo.h | |
| parent | 885aba7ffdfaf410f16364f315411cf8d77da38a (diff) | |
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 <fabian.kosmale@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/global/qlibraryinfo.h')
| -rw-r--r-- | src/corelib/global/qlibraryinfo.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h index dae050f9cc..d4e8f8b050 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 <QtCore/qstring.h> #include <QtCore/qdatetime.h> #include <QtCore/qversionnumber.h> -#else -#include <QtCore/qglobal.h> -#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 |