Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
qstorageinfo_p.h: fix -Wunused-function
Make shouldIncludeFs() class- instead of file-static by moving it into QStorageInfoPrivate. Ditto isParentOf(). Put the functions under Q_OS_UNIX. Fixes Clang -Wunused-function, and removes a non-q/Q-prefixed name from the global namespace. Amends 543ae6e. Manual conflict resolution for 6.8: - tracked a user of shouldIncludeFs() that needs a QStorageInfoPrivate:: prefix added from qstorageinfo_linux.cpp to qstorageinfo_linux_p.h Pick-to: 6.7 Task-number: QTBUG-77059 Task-number: QTBUG-126219 Change-Id: I4cc62ae044d74919d73d08f6ce3ad57f2e00b4c8 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit 5cd154d) Reviewed-by: Ahmad Samir <a.samirh78@gmail.com> Reviewed-by: Lena Biliaieva <lena.biliaieva@qt.io>
- Loading branch information