From a21fe37c723f569887e5e7ba5a19f145134bd216 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Tue, 9 Mar 2021 15:42:54 +0100 Subject: [PATCH] Remove now unneeded QT_BOOTSTRAPPED check from qlibraryinfo.cpp Since qmake links against QtCore, we don't need to check for the bootstrapping case in qlibraryinfo.cpp anymore. Change-Id: I644b1e71db727773b3e32ac650481df134acf033 Reviewed-by: Alexey Edelev Reviewed-by: Alexandru Croitor Reviewed-by: Qt CI Bot --- src/corelib/global/qlibraryinfo.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp index 0ace4ea1c52..4d06ec6e3f1 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -284,7 +284,6 @@ QLibraryInfo::isDebugBuild() #endif } -#ifndef QT_BOOTSTRAPPED /*! \since 5.8 Returns the version of the Qt library. @@ -295,7 +294,6 @@ QVersionNumber QLibraryInfo::version() noexcept { return QVersionNumber(QT_VERSION_MAJOR, QT_VERSION_MINOR, QT_VERSION_PATCH); } -#endif // QT_BOOTSTRAPPED /* * To add a new entry in QLibraryInfo::LibraryPath, add it to the enum