diff options
| author | Lars Knoll <lars.knoll@theqtcompany.com> | 2016-05-11 14:36:13 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@theqtcompany.com> | 2016-05-23 11:19:45 +0000 |
| commit | aa2a3102676a5608d7ad22b868895ec93681a5d9 (patch) | |
| tree | 7a1c08e758febf5ca2be851f3e20d598f8d35811 /src/corelib/global | |
| parent | 9fd407fc6a29c94b4568dd042a05c208255179e0 (diff) | |
Deprecate QLibraryInfo::licensee()/licensedProducts()
This info wasn't really very helpful, and would anyway always
contain either Preview, OpenSource or an empty string for
commercial users.
Change-Id: I311b991834fa83cf1a183083acd5112cda3d2e41
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qlibraryinfo.cpp | 20 | ||||
| -rw-r--r-- | src/corelib/global/qlibraryinfo.h | 6 |
2 files changed, 14 insertions, 12 deletions
diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp index 70e19d1f86..c31b6daa00 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 diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h index a1c146923e..55be706382 100644 --- a/src/corelib/global/qlibraryinfo.h +++ b/src/corelib/global/qlibraryinfo.h @@ -51,8 +51,10 @@ class QStringList; class Q_CORE_EXPORT QLibraryInfo { public: - static QString licensee(); - static QString licensedProducts(); +#if QT_DEPRECATED_SINCE(5, 8) + static QT_DEPRECATED QString licensee(); + static QT_DEPRECATED QString licensedProducts(); +#endif #ifndef QT_NO_DATESTRING #if QT_DEPRECATED_SINCE(5, 5) |