diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2022-12-05 22:29:08 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2022-12-08 04:08:22 +0000 |
| commit | e4851fedd429cfe00de061e81596856fdd22d2c8 (patch) | |
| tree | d5003475447ed8767153574a15cb2e1dffe09731 /src/corelib/global/qlibraryinfo.cpp | |
| parent | 4673f00277ee0dbb01719e37b53dc1745e232ccd (diff) | |
Move qVersion() into it's own header
Partially reverts 50b05e3e2ad969abf4b939d5db2253380e47d775.
The move of qVersion() from qglobal.h into qlibraryinfo.h, a header
not included by qglobal.h, was a conscious, documented, QUIP-0006-
allowed, but stetching the SiC Type A definition, and therefore
unwarranted, SiC.
Fix by moving qVersion() into its own header file, qtversion.h,
included from qglobal.h.
[ChangeLog][Editorial] Remove the entry for qVersion() being moved to
qlibraryinfo.h.
Fixes: QTBUG-108818
Change-Id: I3524802348635512a63fbbb55ddc28ad28f331e8
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Diffstat (limited to 'src/corelib/global/qlibraryinfo.cpp')
| -rw-r--r-- | src/corelib/global/qlibraryinfo.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp index 64fc9fff01..715bda488c 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -661,7 +661,7 @@ QStringList QLibraryInfo::platformPluginArguments(const QString &platformName) /*! \macro QT_VERSION_STR - \relates <QLibraryInfo> + \relates <QtVersion> This macro expands to a string that specifies Qt's version number (for example, "6.1.2"). This is the version with which the application is @@ -672,7 +672,7 @@ QStringList QLibraryInfo::platformPluginArguments(const QString &platformName) */ /*! - \relates <QLibraryInfo> + \relates <QtVersion> Returns the version number of Qt at runtime as a string (for example, "6.1.2"). This is the version of the Qt library in use at \e runtime, |