diff options
| author | Sona Kurazyan <sona.kurazyan@qt.io> | 2022-08-30 10:37:00 +0200 |
|---|---|---|
| committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2022-09-01 13:26:30 +0200 |
| commit | 50b05e3e2ad969abf4b939d5db2253380e47d775 (patch) | |
| tree | 8234f369db98fb720b19f6e14714dd8653b3801d /src/corelib/global/qlibraryinfo.h | |
| parent | b077c419eaafe82ada9ed723165b5c4bfcc80b12 (diff) | |
Move qVersion() from qglobal.h to qlibraryinfo.h
Since qVersion() might be called also from C code, disable the parts of
qlibraryinfo.h that are relevant only for C++ code if __cplusplus is not
defined.
[ChangeLog][Potentially Source-Incompatible Changes] qVersion() is
moved from qglobal.h to qlibraryinfo.h, '#include <QtCore/QLibraryInfo>'
needs to be added where it's used.
Task-number: QTBUG-99313
Change-Id: I3363ef3fa4073114e5151cb3a2a1e8282ad42a4d
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/corelib/global/qlibraryinfo.h')
| -rw-r--r-- | src/corelib/global/qlibraryinfo.h | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h index d4e8f8b050..71d9a01308 100644 --- a/src/corelib/global/qlibraryinfo.h +++ b/src/corelib/global/qlibraryinfo.h @@ -4,12 +4,18 @@ #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: @@ -61,6 +67,21 @@ Q_CORE_EXPORT Q_DECL_CONST_FUNCTION bool qSharedBuild() noexcept; #endif +#endif // __cplusplus + +/* + * If we're compiling C++ code: + * - and this is a non-namespace build, declare qVersion as extern "C" + * - and this is a namespace build, declare it as a regular function + * (we're already inside QT_BEGIN_NAMESPACE / QT_END_NAMESPACE) + * If we're compiling C code, simply declare the function. If Qt was compiled + * in a namespace, qVersion isn't callable anyway. + */ +#if !defined(QT_NAMESPACE) && defined(__cplusplus) && !defined(Q_QDOC) +extern "C" +#endif +Q_CORE_EXPORT Q_DECL_CONST_FUNCTION const char *qVersion(void) Q_DECL_NOEXCEPT; + QT_END_NAMESPACE #endif // QLIBRARYINFO_H |