summaryrefslogtreecommitdiffstats
path: root/src/corelib/global
diff options
context:
space:
mode:
authorEdward Welbourne <edward.welbourne@qt.io>2020-06-23 11:04:09 +0200
committerEdward Welbourne <edward.welbourne@qt.io>2020-06-29 09:37:39 +0200
commitcd74c867d32e9647ab5933f10b3b7cdec38d5978 (patch)
treecd1b5c21e3630f1fcc6813b1802a02c794ae7b3d /src/corelib/global
parentf1638edf4599aa74be439873a7719d9b70c57f54 (diff)
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>
Diffstat (limited to 'src/corelib/global')
-rw-r--r--src/corelib/global/qlibraryinfo.cpp41
-rw-r--r--src/corelib/global/qlibraryinfo.h11
2 files changed, 0 insertions, 52 deletions
diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
index 08aff5fa2a..1380b08372 100644
--- a/src/corelib/global/qlibraryinfo.cpp
+++ b/src/corelib/global/qlibraryinfo.cpp
@@ -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"
diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h
index 031dfe37e2..4a14a9728a 100644
--- a/src/corelib/global/qlibraryinfo.h
+++ b/src/corelib/global/qlibraryinfo.h
@@ -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();