From ed9173e6b8b1affff334cd00ff07258449a7b63c Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sun, 28 Jun 2020 16:15:24 +0000 Subject: [PATCH] do not guard QLibraryInfo class with QT_NO_SETTINGS definition Signed-off-by: Ivailo Monev --- src/core/global/qlibraryinfo.cpp | 7 ------- src/core/global/qlibraryinfo.h | 5 ----- 2 files changed, 12 deletions(-) diff --git a/src/core/global/qlibraryinfo.cpp b/src/core/global/qlibraryinfo.cpp index ca1fa5f2b..b52998ccb 100644 --- a/src/core/global/qlibraryinfo.cpp +++ b/src/core/global/qlibraryinfo.cpp @@ -31,17 +31,12 @@ ** ****************************************************************************/ -#include "qdir.h" -#include "qfile.h" #include "qlibraryinfo.h" -#include "qcoreapplication.h" #include "qconfig.cpp" QT_BEGIN_NAMESPACE -#ifndef QT_NO_SETTINGS - /*! \class QLibraryInfo \brief The QLibraryInfo class provides information about the Katie library. @@ -169,6 +164,4 @@ QString QLibraryInfo::location(LibraryLocation loc) Q_UNREACHABLE(); } -#endif // QT_NO_SETTINGS - QT_END_NAMESPACE diff --git a/src/core/global/qlibraryinfo.h b/src/core/global/qlibraryinfo.h index bce0b9bdd..5ddaefcd4 100644 --- a/src/core/global/qlibraryinfo.h +++ b/src/core/global/qlibraryinfo.h @@ -41,9 +41,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE - -#ifndef QT_NO_SETTINGS - class Q_CORE_EXPORT QLibraryInfo { public: @@ -73,8 +70,6 @@ private: Q_DISABLE_COPY(QLibraryInfo); }; -#endif /* QT_NO_SETTINGS */ - QT_END_NAMESPACE QT_END_HEADER -- 2.11.0