diff options
| author | Schrijvers Luc <[email protected]> | 2024-05-18 12:48:41 +0200 |
|---|---|---|
| committer | Felix Ernst <[email protected]> | 2024-05-21 11:00:41 +0000 |
| commit | 2638402bca4072cdda7bca62bcef29b263ef1cfe (patch) | |
| tree | 591946dfed24b19f8ca96a79dbe44a5e7b1014b1 | |
| parent | 0e1a9bb80f8b5787c90773a1880f2e17729cdfb3 (diff) | |
Haiku build fixes
Co-authored-by: Gerasim Troeglazov <[email protected]>
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/dolphinviewcontainer.cpp | 2 | ||||
| -rw-r--r-- | src/kitemviews/private/kdirectorycontentscounterworker.cpp | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8ea347952..5a4018351 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp index 6eff70f9b..1c9624504 100644 --- a/src/dolphinviewcontainer.cpp +++ b/src/dolphinviewcontainer.cpp @@ -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); diff --git a/src/kitemviews/private/kdirectorycontentscounterworker.cpp b/src/kitemviews/private/kdirectorycontentscounterworker.cpp index 2d60091c6..57cf7b1bc 100644 --- a/src/kitemviews/private/kdirectorycontentscounterworker.cpp +++ b/src/kitemviews/private/kdirectorycontentscounterworker.cpp @@ -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) { |