From aa2a3102676a5608d7ad22b868895ec93681a5d9 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Wed, 11 May 2016 14:36:13 +0200 Subject: 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 --- src/corelib/global/qlibraryinfo.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/corelib/global/qlibraryinfo.cpp') 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 -- cgit v1.2.3