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/qglobal.cpp | |
| 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/qglobal.cpp')
| -rw-r--r-- | src/corelib/global/qglobal.cpp | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index 0e5b2d5b80..ffc899da8b 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -792,21 +792,6 @@ using namespace Qt::StringLiterals; \sa qVersion(), QT_VERSION */ -/*! - \relates <QtGlobal> - - Returns the version number of Qt at runtime as a string (for example, - "6.1.2"). This may be a different version than the version the application - was \e compiled with. - - \sa QT_VERSION_STR, QLibraryInfo::version() -*/ - -const char *qVersion() noexcept -{ - return QT_VERSION_STR; -} - /***************************************************************************** System detection routines *****************************************************************************/ |