1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove now unneeded QT_BOOTSTRAPPED check from qlibraryinfo.cpp

Browse Source 
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 <alexey.edelev@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Joerg Bornemann 2021-03-09 15:42:54 +01:00
parent e158d699e0
commit a21fe37c72
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/global/qlibraryinfo.cpp
View File

@ -284,7 +284,6 @@ QLibraryInfo::isDebugBuild()
#endif #endif
} }
#ifndef QT_BOOTSTRAPPED
/*! /*!
\since 5.8 \since 5.8
Returns the version of the Qt library. 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); 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 * To add a new entry in QLibraryInfo::LibraryPath, add it to the enum