1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QLibraryInfo: undo the !__cplusplus protection again

Browse Source 
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>
This commit is contained in:
Marc Mutz 2022-12-06 07:50:20 +01:00
parent 885aba7ffd
commit 4d43b995bf
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/corelib/global/qlibraryinfo.h
View File

@ -4,18 +4,12 @@
#ifndef QLIBRARYINFO_H #ifndef QLIBRARYINFO_H
#define QLIBRARYINFO_H #define QLIBRARYINFO_H
#if defined(__cplusplus)
#include <QtCore/qstring.h> #include <QtCore/qstring.h>
#include <QtCore/qdatetime.h> #include <QtCore/qdatetime.h>
#include <QtCore/qversionnumber.h> #include <QtCore/qversionnumber.h>
#else
#include <QtCore/qglobal.h>
#endif
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
#if defined(__cplusplus)
class Q_CORE_EXPORT QLibraryInfo class Q_CORE_EXPORT QLibraryInfo
{ {
public: public:
@ -67,8 +61,6 @@ Q_CORE_EXPORT Q_DECL_CONST_FUNCTION bool qSharedBuild() noexcept;
#endif #endif
#endif // __cplusplus
QT_END_NAMESPACE QT_END_NAMESPACE
#endif // QLIBRARYINFO_H #endif // QLIBRARYINFO_H