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

Fix issue with qstorageinfo_unix.cpp not working on Vxworks

Browse Source 
Problem was, that qstorageinfo_unix.cpp is using sys/statvfs.h header, but this header is not available in Vxworks(Vxworks has
its own /sys/ directory).As this feature is not there in Vxworks, we are using a "_stub" file to omit whole implementation.
This is the same solution as it was used for Qt5 for Vxworks.

Change-Id: I1bc5a576e63f403c923cbc93571967184677305f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Marcin Zdunek 2023-07-14 14:45:17 +02:00
parent 5a0c2cabcd
commit 1e3d500463
2 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/corelib/CMakeLists.txt
View File

@ -1022,13 +1022,13 @@ qt_internal_extend_target(Core CONDITION HAIKU AND NOT ANDROID
) )
qt_internal_extend_target(Core qt_internal_extend_target(Core
CONDITION UNIX AND NOT LINUX AND NOT APPLE AND NOT HAIKU AND NOT ANDROID CONDITION UNIX AND NOT LINUX AND NOT APPLE AND NOT HAIKU AND NOT ANDROID AND NOT VXWORKS
SOURCES SOURCES
io/qstandardpaths_unix.cpp io/qstandardpaths_unix.cpp
io/qstorageinfo_unix.cpp io/qstorageinfo_unix.cpp
) )
qt_internal_extend_target(Core CONDITION LINUX AND NOT ANDROID qt_internal_extend_target(Core CONDITION LINUX AND NOT ANDROID AND NOT VXWORKS
SOURCES SOURCES
io/qstandardpaths_unix.cpp io/qstandardpaths_unix.cpp
io/qstorageinfo_linux.cpp io/qstorageinfo_linux.cpp
@ -1145,7 +1145,10 @@ qt_internal_extend_target(Core CONDITION QT_FEATURE_sysv_sem
qt_internal_extend_target(Core CONDITION VXWORKS qt_internal_extend_target(Core CONDITION VXWORKS
SOURCES SOURCES
kernel/qfunctions_vxworks.cpp kernel/qfunctions_vxworks.h io/qstandardpaths_unix.cpp
io/qstorageinfo_stub.cpp
kernel/qfunctions_vxworks.cpp
kernel/qfunctions_vxworks.h
) )
qt_internal_extend_target(Core CONDITION QT_FEATURE_cborstreamreader qt_internal_extend_target(Core CONDITION QT_FEATURE_cborstreamreader

31
src/corelib/io/qstorageinfo_stub.cpp Normal file
View File

@ -0,0 +1,31 @@
// Copyright (C) 2023 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
#include "qstorageinfo_p.h"
QT_BEGIN_NAMESPACE
void QStorageInfoPrivate::initRootPath()
{
Q_UNIMPLEMENTED();
rootPath = QString();
}
void QStorageInfoPrivate::doStat()
{
Q_UNIMPLEMENTED();
}
QList<QStorageInfo> QStorageInfoPrivate::mountedVolumes()
{
Q_UNIMPLEMENTED();
return QList<QStorageInfo>();
}
QStorageInfo QStorageInfoPrivate::root()
{
Q_UNIMPLEMENTED();
return QStorageInfo();
}
QT_END_NAMESPACE