kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-09-28 12:45:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Haiku build fixes

Browse source 
Co-authored-by: Gerasim Troeglazov <3dEyes@gmail.com>
This commit is contained in:
Schrijvers Luc 2024-05-18 12:48:41 +02:00 committed by Felix Ernst
parent 0e1a9bb80f
commit 2638402bca
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -53,7 +53,7 @@ find_package(Qt6 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
DBus
)
if (UNIX AND NOT APPLE)
if (UNIX AND NOT APPLE AND NOT HAIKU)
set(HAVE_X11 TRUE)
endif()
@ -150,7 +150,7 @@ endif()
# Compatibility with platforms without native fts (e.g. musl)
check_include_files("sys/types.h;sys/stat.h;fts.h" HAVE_FTS_H)
if(HAVE_FTS_H)
if(HAVE_FTS_H AND NOT HAIKU)
check_function_exists(fts_open HAVE_FTS_OPEN)
if(NOT HAVE_FTS_OPEN)
check_library_exists(fts fts_open "" HAVE_LIB_FTS)

2
src/dolphinviewcontainer.cpp
View file

@ -106,7 +106,7 @@ DolphinViewContainer::DolphinViewContainer(const QUrl &url, QWidget *parent)
m_messageWidget->setPosition(KMessageWidget::Header);
m_messageWidget->hide();
#ifndef Q_OS_WIN
#if !defined(Q_OS_WIN) && !defined(Q_OS_HAIKU)
if (getuid() == 0) {
// We must be logged in as the root user; show a big scary warning
showMessage(i18n("Running Dolphin as root can be dangerous. Please be careful."), Warning);

6
src/kitemviews/private/kdirectorycontentscounterworker.cpp
View file

@ -8,7 +8,7 @@
#include "kdirectorycontentscounterworker.h"
// Required includes for countDirectoryContents():
#ifdef Q_OS_WIN
#if defined(Q_OS_WIN) || defined(Q_OS_HAIKU)
#include <QDir>
#else
#include <QElapsedTimer>
@ -23,7 +23,7 @@ KDirectoryContentsCounterWorker::KDirectoryContentsCounterWorker(QObject *parent
qRegisterMetaType<KDirectoryContentsCounterWorker::Options>();
}
#ifndef Q_OS_WIN
#if !defined(Q_OS_WIN) && !defined(Q_OS_HAIKU)
void KDirectoryContentsCounterWorker::walkDir(const QString &dirPath, bool countHiddenFiles, uint allowedRecursiveLevel)
{
QByteArray text = dirPath.toLocal8Bit();
@ -138,7 +138,7 @@ void KDirectoryContentsCounterWorker::countDirectoryContents(const QString &path
{
const bool countHiddenFiles = options & CountHiddenFiles;
#ifdef Q_OS_WIN
#if defined(Q_OS_WIN) || defined(Q_OS_HAIKU)
QDir dir(path);
QDir::Filters filters = QDir::NoDotAndDotDot | QDir::System | QDir::AllEntries;
if (countHiddenFiles) {