diff options
Diffstat (limited to 'src/corelib/global/qlibraryinfo.cpp')
| -rw-r--r-- | src/corelib/global/qlibraryinfo.cpp | 35 |
1 files changed, 24 insertions, 11 deletions
diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp index 458200180e..4303f74709 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -229,30 +229,30 @@ QLibraryInfo::QLibraryInfo() { } /*! - Returns the person to whom this build of Qt is licensed. - - \sa licensedProducts() + \deprecated + This function used to return the person to whom this build of Qt is licensed, now returns an empty string. */ +#if QT_DEPRECATED_SINCE(5, 8) QString QLibraryInfo::licensee() { - const char * volatile str = QT_CONFIGURE_LICENSEE; - return QString::fromLocal8Bit(str); + return QString(); } +#endif /*! - Returns the products that the license for this build of Qt has access to. - - \sa licensee() + \deprecated + This function used to return the products that the license for this build of Qt has access to, now returns an empty string. */ +#if QT_DEPRECATED_SINCE(5, 8) QString QLibraryInfo::licensedProducts() { - const char * volatile str = QT_CONFIGURE_LICENSED_PRODUCTS; - return QString::fromLatin1(str); + return QString(); } +#endif /*! \since 4.6 @@ -366,6 +366,19 @@ QLibraryInfo::isDebugBuild() #endif } +#ifndef QT_BOOTSTRAPPED +/*! + \since 5.8 + Returns the version of the Qt library. + + \sa qVersion() +*/ +QVersionNumber QLibraryInfo::version() Q_DECL_NOTHROW +{ + return QVersionNumber(QT_VERSION_MAJOR, QT_VERSION_MINOR, QT_VERSION_PATCH); +} +#endif // QT_BOOTSTRAPPED + #endif // QT_BUILD_QMAKE /* @@ -519,7 +532,7 @@ QLibraryInfo::rawLocation(LibraryLocation loc, PathGroup group) reg_var.setMinimal(true); while((rep = reg_var.indexIn(ret)) != -1) { ret.replace(rep, reg_var.matchedLength(), - QString::fromLocal8Bit(qgetenv(ret.mid(rep + 2, + QString::fromLocal8Bit(qgetenv(ret.midRef(rep + 2, reg_var.matchedLength() - 3).toLatin1().constData()).constData())); } |