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

QStorageInfo/Linux: Add missing static for doParseMountInfo()

Browse Source 
Amends 08c6d5c3fdfe9ad40053451ab3a9eb0492e273da, which accidentally made
this an public, non-namespaced symbol out of QtCore.

Pick-to: 6.8
Change-Id: I3217dee5b44730440f22fffd11a6888c4ee76e45
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
Thiago Macieira 2024-09-17 07:43:59 -07:00
parent 83483b8b20
commit 80d1787759
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/corelib/io/qstorageinfo_linux_p.h
View File

@ -35,7 +35,12 @@ enum class FilterMountInfo {
Filtered, Filtered,
}; };
Q_AUTOTEST_EXPORT std::vector<MountInfo> doParseMountInfo( #ifdef QT_BUILD_INTERNAL
Q_AUTOTEST_EXPORT
#else
static
#endif
std::vector<MountInfo> doParseMountInfo(
const QByteArray &mountinfo, FilterMountInfo filter = FilterMountInfo::All); const QByteArray &mountinfo, FilterMountInfo filter = FilterMountInfo::All);
QT_END_NAMESPACE QT_END_NAMESPACE

2
tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp
View File

@ -22,7 +22,7 @@
#include "../../../../manual/qstorageinfo/printvolumes.cpp" #include "../../../../manual/qstorageinfo/printvolumes.cpp"
#ifdef Q_OS_LINUX #if defined(Q_OS_LINUX) && defined(QT_BUILD_INTERNAL)
# include "../../../../../src/corelib/io/qstorageinfo_linux_p.h" # include "../../../../../src/corelib/io/qstorageinfo_linux_p.h"
#endif #endif