Remove some long-deprecated methods of QLibraryInfo
Change-Id: If5e85f813921b44971ca8572858051b53e1127a8 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Sune Vuorela <sune@vuorela.dk>
This commit is contained in:
parent
f1638edf45
commit
cd74c867d3
@ -247,47 +247,6 @@ QSettings *QLibraryInfoPrivate::findConfiguration()
|
||||
QLibraryInfo::QLibraryInfo()
|
||||
{ }
|
||||
|
||||
/*!
|
||||
\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()
|
||||
{
|
||||
return QString();
|
||||
}
|
||||
#endif
|
||||
|
||||
/*!
|
||||
\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()
|
||||
{
|
||||
return QString();
|
||||
}
|
||||
#endif
|
||||
|
||||
/*!
|
||||
\since 4.6
|
||||
\deprecated
|
||||
This function used to return the installation date for this build of Qt, but now returns a constant date.
|
||||
*/
|
||||
#if QT_CONFIG(datestring)
|
||||
#if QT_DEPRECATED_SINCE(5, 5)
|
||||
QDate
|
||||
QLibraryInfo::buildDate()
|
||||
{
|
||||
return QDate::fromString(QString::fromLatin1("2012-12-20"), Qt::ISODate);
|
||||
}
|
||||
#endif
|
||||
#endif // datestring
|
||||
|
||||
#if defined(Q_CC_INTEL) // must be before GNU, Clang and MSVC because ICC/ICL claim to be them
|
||||
# ifdef __INTEL_CLANG_COMPILER
|
||||
# define ICC_COMPAT "Clang"
|
||||
|
@ -51,17 +51,6 @@ class QStringList;
|
||||
class Q_CORE_EXPORT QLibraryInfo
|
||||
{
|
||||
public:
|
||||
#if QT_DEPRECATED_SINCE(5, 8)
|
||||
static QT_DEPRECATED QString licensee();
|
||||
static QT_DEPRECATED QString licensedProducts();
|
||||
#endif
|
||||
|
||||
#if QT_CONFIG(datestring)
|
||||
#if QT_DEPRECATED_SINCE(5, 5)
|
||||
static QT_DEPRECATED QDate buildDate();
|
||||
#endif // QT_DEPRECATED_SINCE(5, 5)
|
||||
#endif // datestring
|
||||
|
||||
static const char * build() noexcept;
|
||||
|
||||
static bool isDebugBuild();
|
||||
|
Loading…
x
Reference in New Issue
Block a user